src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java

changeset 368
0989ad8c0860
parent 286
f50545b5e2f1
child 397
b99d7e355d4b
     1.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java	Thu Apr 04 19:05:24 2013 -0700
     1.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java	Tue Apr 09 14:51:13 2013 +0100
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -77,7 +77,7 @@
    1.11  
    1.12          String relativeRef = findExternalResource(namespaceURI, localName, atts);
    1.13          if (relativeRef == null) {
    1.14 -            return; // non found
    1.15 +            return; // not found
    1.16          }
    1.17          try {
    1.18              // absolutize URL.
    1.19 @@ -97,7 +97,9 @@
    1.20  
    1.21              // then parse this schema as well,
    1.22              // but don't mark this document as a root.
    1.23 -            parent.parse(ref, false);
    1.24 +            if (parent != null) { // this is there to allow easier testing
    1.25 +                parent.parse(ref, false);
    1.26 +            }
    1.27          } catch (URISyntaxException e) {
    1.28              String msg = e.getMessage();
    1.29              if (new File(relativeRef).exists()) {

mercurial