Merge branch '6.2.x'

confluentinc · Feb 24, 2021 · e6ae4a9 · e6ae4a9
2 parents cb8c765 + 7086655
commit e6ae4a9
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/client/src/main/java/io/confluent/kafka/schemaregistry/avro/AvroSchema.java b/client/src/main/java/io/confluent/kafka/schemaregistry/avro/AvroSchema.java
@@ -199,7 +199,8 @@ public boolean equals(Object o) {
       return false;
     }
     AvroSchema that = (AvroSchema) o;
-    return Objects.equals(schemaObj, that.schemaObj)
+    // Can't use schemaObj as it doesn't compare field doc, aliases, etc.
+    return Objects.equals(canonicalString(), that.canonicalString())
         && Objects.equals(references, that.references)
         && Objects.equals(version, that.version);
   }