svn commit: r1559259 - /cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java

[dkulp]

Author: dkulp
Date: Fri Jan 17 21:56:54 2014
New Revision: 1559259

URL: http://svn.apache.org/r1559259
Log:
Merged revisions 1559242 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1559242 | dkulp | 2014-01-17 15:19:57 -0500 (Fri, 17 Jan 2014) | 2 lines

  [CXF-5476] Add an NPE guard

........

Modified:
    
cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java

Modified: 
cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java?rev=1559259&r1=1559258&r2=1559259&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
 Fri Jan 17 21:56:54 2014
@@ -256,7 +256,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());
         }