svn commit: r1173122 - /tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2EngineIntegration.java

[antelder]

Author: antelder
Date: Tue Sep 20 12:46:01 2011
New Revision: 1173122

URL: http://svn.apache.org/viewvc?rev=1173122&view=rev
Log:
Avoid NPE when no port location defined

Modified:
    
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2EngineIntegration.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2EngineIntegration.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2EngineIntegration.java?rev=1173122&r1=1173121&r2=1173122&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2EngineIntegration.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2EngineIntegration.java
 Tue Sep 20 12:46:01 2011
@@ -531,12 +531,15 @@ public class Axis2EngineIntegration {
     //========================================================= 
     
     public static String getPortAddress(Port port) {
-        Object ext = port.getExtensibilityElements().get(0);
-        if (ext instanceof SOAPAddress) {
-            return ((SOAPAddress)ext).getLocationURI();
-        }
-        if (ext instanceof SOAP12Address) {
-            return ((SOAP12Address)ext).getLocationURI();
+        List<?> es = port.getExtensibilityElements();
+        if (es != null && es.size() > 0) {
+            Object ext = es.get(0);
+            if (ext instanceof SOAPAddress) {
+                return ((SOAPAddress)ext).getLocationURI();
+            }
+            if (ext instanceof SOAP12Address) {
+                return ((SOAP12Address)ext).getLocationURI();
+            }
         }
         return null;
     }