From 61bd023e3d61fbf2b644306f951b197260c14d04 Mon Sep 17 00:00:00 2001 From: Thomas Hoffmann Date: Fri, 16 Sep 2016 12:36:59 +0200 Subject: [PATCH] Fix NullPointerException if there are no other properties Change-Id: I6711e96d4b119b2cf78860d4eb43fc178edae372 --- .../main/java/io/swagger/codegen/InlineModelResolver.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java index d7c2b2355ec8..34b0906fd10e 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java @@ -182,8 +182,10 @@ public class InlineModelResolver { } } else if (model instanceof ComposedModel) { ComposedModel m = (ComposedModel) model; - Map properties = m.getChild().getProperties(); - flattenProperties(properties, modelName); + if (m.getChild() != null) { + Map properties = m.getChild().getProperties(); + flattenProperties(properties, modelName); + } } } }