svn commit: r1374804 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortAddressRegistryImpl.java

[rmannibucau]

Author: rmannibucau
Date: Sun Aug 19 17:29:05 2012
New Revision: 1374804

URL: http://svn.apache.org/viewvc?rev=1374804&view=rev
Log:
TOMEE-383 avoiding NPE when a pojo ws is deployed without interface

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortAddressRegistryImpl.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortAddressRegistryImpl.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortAddressRegistryImpl.java?rev=1374804&r1=1374803&r2=1374804&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortAddressRegistryImpl.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortAddressRegistryImpl.java
 Sun Aug 19 17:29:05 2012
@@ -41,14 +41,17 @@ public class PortAddressRegistryImpl imp
 
         // create portAddress
         PortAddress portAddress = portsById.get(portId);
-        if (portAddress != null) {
+        if (portAddress != null) { // shouldn't happen but better to avoid NPE 
here
             throw new OpenEJBException("A webservice port with qname " + 
portAddress.getPortQName() + " is already registered to the portId " + portId);
         }
         portAddress = new PortAddress(portId, serviceQName, portQName, 
address, portInterface);
         portsById.put(portId, portAddress);
 
         // portsByInterface
-        Map<String, PortAddress> ports = portsByInterface.get(portInterface);
+        Map<String, PortAddress> ports = null;
+        if (portInterface != null) { // localbean have no interface
+            ports = portsByInterface.get(portInterface);
+        }
         if (ports == null) {
             ports = new TreeMap<String, PortAddress>();
             portsByInterface.put(portInterface, ports);