[avro] 01/02: [AVRO-2034] Remove conditions that will always be true/false

[dkulp]

This is an automated email from the ASF dual-hosted git repository.

dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/avro.git

commit 254ee8ff595c6c52580128aec9355394f96382d5
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Tue Dec 11 13:14:29 2018 -0500

    [AVRO-2034] Remove conditions that will always be true/false
---
 .../src/main/java/org/apache/avro/io/JsonDecoder.java | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/lang/java/avro/src/main/java/org/apache/avro/io/JsonDecoder.java 
b/lang/java/avro/src/main/java/org/apache/avro/io/JsonDecoder.java
index 0a6ef09..26a7b1e 100644
--- a/lang/java/avro/src/main/java/org/apache/avro/io/JsonDecoder.java
+++ b/lang/java/avro/src/main/java/org/apache/avro/io/JsonDecoder.java
@@ -500,21 +500,16 @@ public class JsonDecoder extends ParsingDecoder
         in.nextToken();
       }
 
-      if (in.getCurrentToken() == JsonToken.END_OBJECT) {
-
-        if (top == Symbol.RECORD_END) {
-          if (currentReorderBuffer != null && 
!currentReorderBuffer.savedFields.isEmpty()) {
-            throw error("Unknown fields: " + 
currentReorderBuffer.savedFields.keySet());
-          }
-          currentReorderBuffer = reorderBuffers.pop();
+      if (top == Symbol.RECORD_END) {
+        if (currentReorderBuffer != null && 
!currentReorderBuffer.savedFields.isEmpty()) {
+          throw error("Unknown fields: " + 
currentReorderBuffer.savedFields.keySet());
         }
+        currentReorderBuffer = reorderBuffers.pop();
+      }
 
-        //AVRO-2034 advance beyond the end object for the next record.
-        in.nextToken();
+      //AVRO-2034 advance beyond the end object for the next record.
+      in.nextToken();
 
-      } else {
-        throw error(top == Symbol.RECORD_END ? "record-end" : "union-end");
-      }
     } else {
       throw new AvroTypeException("Unknown action symbol " + top);
     }