Merge pull request #3313 from swagger-api/issue-3311

refs #3311 - fix NPE
swagger-api · Oct 1, 2019 · 5f083aa · 5f083aa
2 parents 01fa303 + a0a623c
commit 5f083aa
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/modules/swagger-core/src/main/java/io/swagger/v3/core/jackson/ModelResolver.java b/modules/swagger-core/src/main/java/io/swagger/v3/core/jackson/ModelResolver.java
@@ -317,7 +317,7 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
          */
         Schema resolvedModel = context.resolve(annotatedType);
         if (resolvedModel != null) {
-            if (name.equals(resolvedModel.getName())) {
+            if (name != null && name.equals(resolvedModel.getName())) {
                 return resolvedModel;
             }
         }