Fix TUSCANY-2481

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@679629 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 2 deletions

diff --git a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
index 7939ff0c67..1b1867a1f1 100644
--- a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
+++ b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
@@ -507,8 +507,10 @@ public class Axis2ServiceProvider {
 
     private void addSchemas(WSDLDefinition wsdlDef, AxisService axisService) {
         for (XSDefinition xsDef : wsdlDef.getXmlSchemas()) {
-            axisService.addSchema(xsDef.getSchema());
-            updateSchemaRefs(xsDef.getSchema(), axisService.getName());
+            if (xsDef.getSchema() != null) {
+                axisService.addSchema(xsDef.getSchema());
+                updateSchemaRefs(xsDef.getSchema(), axisService.getName());
+            }
         }
         for (WSDLDefinition impDef : wsdlDef.getImportedDefinitions()) {
             addSchemas(impDef, axisService);