Merge pull request #1138 from swagger-api/nullcheck

gracekarina · web-flow · commit a569be65f9f6 · 2019-06-26T10:14:51.000-05:00
null check in SwaggerDeserializer 915
diff --git a/modules/swagger-parser/src/main/java/io/swagger/parser/util/SwaggerDeserializer.java b/modules/swagger-parser/src/main/java/io/swagger/parser/util/SwaggerDeserializer.java
@@ -912,8 +912,10 @@ public Model definition(ObjectNode node, String location, ParseResult result) {
                     if(propertyNode.getNodeType().equals(JsonNodeType.OBJECT)) {
                         ObjectNode on = (ObjectNode) propertyNode;
                         Property property = property(on, location, result);
-                        if("array".equals( property.getType()) && !(property instanceof ArrayProperty && ((ArrayProperty) property).getItems() != null)) {
-                            result.missing(location, "items");
+                        if (property != null) {
+                            if ("array".equals(property.getType()) && !(property instanceof ArrayProperty && ((ArrayProperty) property).getItems() != null)) {
+                                result.missing(location, "items");
+                            }
                         }
                         impl.property(propertyName, property);
                     }

Original file line number	Diff line number	Diff line change
`@@ -912,8 +912,10 @@ public Model definition(ObjectNode node, String location, ParseResult result) {`
`912`	`912`	`if(propertyNode.getNodeType().equals(JsonNodeType.OBJECT)) {`
`913`	`913`	`ObjectNode on = (ObjectNode) propertyNode;`
`914`	`914`	`Property property = property(on, location, result);`
`915`		`- if("array".equals( property.getType()) && !(property instanceof ArrayProperty && ((ArrayProperty) property).getItems() != null)) {`
`916`		`- result.missing(location, "items");`
	`915`	`+ if (property != null) {`
	`916`	`+ if ("array".equals(property.getType()) && !(property instanceof ArrayProperty && ((ArrayProperty) property).getItems() != null)) {`
	`917`	`+ result.missing(location, "items");`
	`918`	`+ }`
`917`	`919`	`}`
`918`	`920`	`impl.property(propertyName, property);`
`919`	`921`	`}`