src/share/jaxws_classes/com/sun/tools/internal/ws/util/ForkEntityResolver.java

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 47,54 ****
--- 47,60 ----
  
      public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
          InputSource is = lhs.resolveEntity(publicId, systemId);
          if(is!=null)
              return is;
+ 
+         if(publicId == null) {
+           // WorkAround: Ant's XMLCatalog supports public IDs only, this allows us to treat it as system IDs
+           publicId = systemId;
+         }
+ 
          return rhs.resolveEntity(publicId, systemId);
      }
  }