Mercurial > jdk8-mips64-public > jaxws / file diff

     1.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/ws/util/ForkEntityResolver.java	Thu Apr 04 19:05:24 2013 -0700
     1.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/util/ForkEntityResolver.java	Tue Apr 09 14:51:13 2013 +0100
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2011, 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 @@ -49,6 +49,12 @@
    1.11          InputSource is = lhs.resolveEntity(publicId, systemId);
    1.12          if(is!=null)
    1.13              return is;
    1.14 +
    1.15 +        if(publicId == null) {
    1.16 +          // WorkAround: Ant's XMLCatalog supports public IDs only, this allows us to treat it as system IDs
    1.17 +          publicId = systemId;
    1.18 +        }
    1.19 +
    1.20          return rhs.resolveEntity(publicId, systemId);
    1.21      }
    1.22  }