Author: dkulp
Date: Thu May 27 16:50:55 2010
New Revision: 948909
URL: http://svn.apache.org/viewvc?rev=948909&view=rev
Log:
Merged revisions 948907 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r948907 | dkulp | 2010-05-27 12:49:17 -0400 (Thu, 27 May 2010) | 2 lines
[CXF-2830] Add NPE guard to EndpointReferenceUtils
Patch from Chris Nelson applied
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:948907
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java?rev=948909&r1=948908&r2=948909&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
(original)
+++
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
Thu May 27 16:50:55 2010
@@ -161,7 +161,7 @@ public final class EndpointReferenceUtil
impl.setByteStream(new ByteArrayInputStream(ds));
done.add(newId + ":" + namespaceURI);
}
- if (impl == null && bus != null) {
+ if (impl == null && bus != null && systemId != null) {
ResourceManager rm = bus.getExtension(ResourceManager.class);
URL url = rm == null ? null : rm.resolveResource(systemId,
URL.class);
if (url != null) {
