67: Fix null-pointer-exception during xml to xsd conversion.

castor-data-binding · Mar 7, 2017 · 235a4f3 · 235a4f3
1 parent dd3081b
commit 235a4f3
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/schema/src/main/java/org/exolab/castor/xml/schema/util/XMLInstance2SchemaHandler.java b/schema/src/main/java/org/exolab/castor/xml/schema/util/XMLInstance2SchemaHandler.java
@@ -444,6 +444,7 @@ private void merge(ElementDecl e1, ElementDecl e2) throws SchemaException {
         return; // -- nothing to merge
       if (e2Type.isSimpleType()) {
         e1.setType(e2Type);
+        e1Type = e2Type;
       } else {
         ComplexType cType = new ComplexType(_schema);
         Group group = new Group();
@@ -455,6 +456,7 @@ private void merge(ElementDecl e1, ElementDecl e2) throws SchemaException {
     } else if (e2Type == null) {
       if (e1Type.isSimpleType()) {
         e2.setType(e1Type);
+        e2Type = e1Type;
       } else {
         ComplexType cType = new ComplexType(_schema);
         Group group = new Group();