From b46cd2bd0f57b0385883b1b5a8c12711ee68c007 Mon Sep 17 00:00:00 2001 From: nash Date: Tue, 12 Aug 2008 20:40:20 +0000 Subject: Fix TUSCANY-2531 git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@685307 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'branches/sca-java-1.3/modules/binding-ws-axis2') diff --git a/branches/sca-java-1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java b/branches/sca-java-1.3/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/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java +++ b/branches/sca-java-1.3/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); + } } } } -- cgit v1.2.3