Support binary input and output - fix some merge problems

2015-08-24 15:59:58 +03:00
parent c177cf75d2
commit b0c776bbea
3 changed files with 6 additions and 5 deletions
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
@@ -534,6 +534,7 @@ public class DefaultCodegen {
        if (model instanceof ArrayModel) {
            ArrayModel am = (ArrayModel) model;
            ArrayProperty arrayProperty = new ArrayProperty(am.getItems());
+            m.hasEnums = false; // Otherwise there will be a NullPointerException in JavaClientCodegen.fromModel
            addParentContainer(m, name, arrayProperty);
        } else if (model instanceof RefModel) {
            // TODO