Merge pull request #3304 from springfox/bugfix/model-enhancement

Check to prevent NPE. #3303
springfox · May 6, 2020 · e136026 · e136026
2 parents 4c181b6 + 500ddcf
commit e136026
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...-spring-web/src/main/java/springfox/documentation/spring/web/scanners/ApiModelReader.java b/...-spring-web/src/main/java/springfox/documentation/spring/web/scanners/ApiModelReader.java
@@ -291,7 +291,7 @@ private Set<String> findSameModels(
       for (ModelReference modelReference : rootModel.getSubTypes()) {
         Optional<String> modelId = getModelId(modelReference);
 
-        if (modelId.isPresent()) {
+        if (modelId.isPresent() && mergingContext.containsModel(modelId.get())) {
           String sModelId = modelId.get();
           ModelContext modelContext = Optional.ofNullable(parametersMatching.get(sModelId))
               .map(op -> op.orElseGet(() -> parameter))
@@ -311,7 +311,7 @@ private Set<String> findSameModels(
         ModelReference modelReference = property.getModelRef();
         Optional<String> modelId = getModelId(modelReference);
 
-        if (modelId.isPresent()) {
+        if (modelId.isPresent() && mergingContext.containsModel(modelId.get())) {
           String sModelId = modelId.get();
           ModelContext modelContext = Optional.ofNullable(parametersMatching.get(sModelId))
               .map(op -> op.orElseGet(() -> parameter))