Skip to content

Catch IllegalArgumentException after date parsing #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cyrilantony wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Catch IllegalArgumentException after date parsing #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd3081b
Catch IllegalArgumentException after date parsing
Aug 17, 2016
235a4f3
67: Fix null-pointer-exception during xml to xsd conversion.
Mar 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions schema/src/main/java/org/exolab/castor/xml/schema/util/DatatypeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions schema/src/main/java/org/exolab/castor/xml/schema/util/XMLInstance2SchemaHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand Down