From dd3081bfc37184d32ff01be53d40b3fe781ee81f Mon Sep 17 00:00:00 2001
From: Cyril Antony <cyrilantony@intalio.com>
Date: Wed, 17 Aug 2016 17:43:38 +0530
Subject: [PATCH 1/2] Catch IllegalArgumentException after date parsing

---
 .../java/org/exolab/castor/xml/schema/util/DatatypeHandler.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/schema/src/main/java/org/exolab/castor/xml/schema/util/DatatypeHandler.java b/schema/src/main/java/org/exolab/castor/xml/schema/util/DatatypeHandler.java
index bd2a22058..cd8c131d2 100644
--- a/schema/src/main/java/org/exolab/castor/xml/schema/util/DatatypeHandler.java
+++ b/schema/src/main/java/org/exolab/castor/xml/schema/util/DatatypeHandler.java
@@ -169,6 +169,7 @@ public static String guessType(String value) {
       Date.parseDate(value);
       return DATE_TYPE;
     } catch (ParseException px) {
+    } catch (IllegalArgumentException ex) {
     }
 
     // -- check for time

From 235a4f32447b8253ed434a54a143b7ffbba9a59b Mon Sep 17 00:00:00 2001
From: Cyril Antony <c.antony@everteam>
Date: Tue, 7 Mar 2017 20:47:38 +0530
Subject: [PATCH 2/2] 67: Fix null-pointer-exception during xml to xsd
 conversion.

---
 .../castor/xml/schema/util/XMLInstance2SchemaHandler.java       | 2 ++
 1 file changed, 2 insertions(+)

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
index 7b3ae9318..d75027d82 100644
--- 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();