diff -r 8c0b6bccfe47 -r 0989ad8c0860 src/share/jaxws_classes/com/sun/tools/internal/ws/util/ForkEntityResolver.java --- a/src/share/jaxws_classes/com/sun/tools/internal/ws/util/ForkEntityResolver.java Thu Apr 04 19:05:24 2013 -0700 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/util/ForkEntityResolver.java Tue Apr 09 14:51:13 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -49,6 +49,12 @@ 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); } }