summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.3.1/modules/binding-ws-axis2/src
diff options
context:
space:
mode:
authornash <nash@13f79535-47bb-0310-9956-ffa450edef68>2008-08-14 13:52:14 +0000
committernash <nash@13f79535-47bb-0310-9956-ffa450edef68>2008-08-14 13:52:14 +0000
commitd88e15805f4a4145b4975e166561340c134c9d24 (patch)
treeede9b0efdc4a58d2761fc2a67e3fa15eaa4567da /branches/sca-java-1.3.1/modules/binding-ws-axis2/src
parent5c6c6b427b6a2b0fbb89831576d9e8cd89e545bc (diff)
Fix TUSCANY-2531
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@685897 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.3.1/modules/binding-ws-axis2/src')
-rw-r--r--branches/sca-java-1.3.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/branches/sca-java-1.3.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java b/branches/sca-java-1.3.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
index 263b96d20f..532c0848ec 100644
--- a/branches/sca-java-1.3.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
+++ b/branches/sca-java-1.3.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
@@ -536,10 +536,12 @@ public class Axis2ServiceProvider {
if (obj instanceof XmlSchemaExternal) {
XmlSchemaExternal extSchema = (XmlSchemaExternal)obj;
String location = extSchema.getSchemaLocation();
- if (location.indexOf(":/") < 0 & location.indexOf("?xsd=") < 0) {
+ if (location.length() > 0 && location.indexOf(":/") < 0 && location.indexOf("?xsd=") < 0) {
extSchema.setSchemaLocation(name + "?xsd=" + location);
}
- updateSchemaRefs(extSchema.getSchema(), name);
+ if (extSchema.getSchema() != null) {
+ updateSchemaRefs(extSchema.getSchema(), name);
+ }
}
}
}