cleaned some code in GenericJsonRecord (apache#10527)

(cherry picked from commit 24b0d06)
datastax · May 12, 2021 · 56c2f6b · 56c2f6b
1 parent b1ee56c
commit 56c2f6b
Showing 1 changed file with 19 additions and 19 deletions.
diff --git a/...-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonRecord.java b/...-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonRecord.java
@@ -98,29 +98,29 @@ public Object getField(String fieldName) {
     }
 
     private boolean isBinaryValue(String fieldName) {
-        boolean isBinary = false;
+        if (schemaInfo == null) {
+            return false;
+        }
 
-        do {
-            if (schemaInfo == null) {
-                break;
+        boolean isBinary = false;
+        try {
+            org.apache.avro.Schema schema = parseAvroSchema(schemaInfo.getSchemaDefinition());
+            org.apache.avro.Schema.Field field = schema.getField(fieldName);
+            if (field == null) {
+                return false;
             }
-
-            try {
-                org.apache.avro.Schema schema = parseAvroSchema(schemaInfo.getSchemaDefinition());
-                org.apache.avro.Schema.Field field = schema.getField(fieldName);
-                ObjectMapper objectMapper = new ObjectMapper();
-                JsonNode jsonNode = objectMapper.readTree(field.schema().toString());
-                for (JsonNode node : jsonNode) {
-                    JsonNode jn = node.get("type");
-                    if (jn != null && ("bytes".equals(jn.asText()) || "byte".equals(jn.asText()))) {
-                        isBinary = true;
-                    }
+            ObjectMapper objectMapper = new ObjectMapper();
+            JsonNode jsonNode = objectMapper.readTree(field.schema().toString());
+            for (JsonNode node : jsonNode) {
+                JsonNode jn = node.get("type");
+                if (jn != null && ("bytes".equals(jn.asText()) || "byte".equals(jn.asText()))) {
+                    isBinary = true;
+                    break;
                 }
-            } catch (Exception e) {
-                log.error("parse schemaInfo failed. ", e);
             }
-        } while (false);
-
+        } catch (Exception e) {
+            log.error("parse schemaInfo failed. ", e);
+        }
         return isBinary;
     }