Merge pull request #2757 from swagger-api/ticket-2740

refs #2740 - updated equals()
swagger-api · Apr 10, 2018 · 89c53e4 · 89c53e4
2 parents e4ebc2e + febdce8
commit 89c53e4
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/modules/swagger-core/src/main/java/io/swagger/v3/core/converter/AnnotatedType.java b/modules/swagger-core/src/main/java/io/swagger/v3/core/converter/AnnotatedType.java
@@ -184,7 +184,11 @@ public boolean equals(Object o) {
         }
         AnnotatedType that = (AnnotatedType) o;
 
-        if (type != that.type) {
+        if ((type == null && that.type != null) || (type != null && that.type == null)) {
+            return false;
+        }
+
+        if (type != null && that.type != null && !type.equals(that.type)) {
             return false;
         }
         return Arrays.equals(this.ctxAnnotations, that.ctxAnnotations);