cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1559242 - /cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
Date Fri, 17 Jan 2014 20:19:57 GMT
Author: dkulp
Date: Fri Jan 17 20:19:57 2014
New Revision: 1559242

URL: http://svn.apache.org/r1559242
Log:
[CXF-5476] Add an NPE guard

Modified:
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java?rev=1559242&r1=1559241&r2=1559242&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java Fri Jan
17 20:19:57 2014
@@ -270,7 +270,9 @@ public class ServiceImpl extends Service
         
         //When the dispatch is created from EPR, the EPR's address will be set in portInfo
         PortInfoImpl portInfo = getPortInfo(portName);
-        if (portInfo != null && !portInfo.getAddress().equals(ei.getAddress())) {
+        if (portInfo != null
+            && portInfo.getAddress() != null 
+            && !portInfo.getAddress().equals(ei.getAddress())) {
             ei.setAddress(portInfo.getAddress());
         }
 



Mime
View raw message