summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.3/modules/binding-ws-axis2/src/main/java
diff options
context:
space:
mode:
authornash <nash@13f79535-47bb-0310-9956-ffa450edef68>2008-08-14 11:59:11 +0000
committernash <nash@13f79535-47bb-0310-9956-ffa450edef68>2008-08-14 11:59:11 +0000
commit626fdac30ca9826adc39357f6ff55aaebf360a7f (patch)
tree7d1a35c141c270470cdfa845d589793e4a312c9b /branches/sca-java-1.3/modules/binding-ws-axis2/src/main/java
parentfa3b39ed720bfe83911996c673b72a608a3c7cbf (diff)
Reverse commit 685307 which should not have been checked into the 1.3 branch
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@685867 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.3/modules/binding-ws-axis2/src/main/java')
-rw-r--r--branches/sca-java-1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java6
1 files changed, 2 insertions, 4 deletions
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 532c0848ec..263b96d20f 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,12 +536,10 @@ public class Axis2ServiceProvider {
if (obj instanceof XmlSchemaExternal) {
XmlSchemaExternal extSchema = (XmlSchemaExternal)obj;
String location = extSchema.getSchemaLocation();
- if (location.length() > 0 && location.indexOf(":/") < 0 && location.indexOf("?xsd=") < 0) {
+ if (location.indexOf(":/") < 0 & location.indexOf("?xsd=") < 0) {
extSchema.setSchemaLocation(name + "?xsd=" + location);
}
- if (extSchema.getSchema() != null) {
- updateSchemaRefs(extSchema.getSchema(), name);
- }
+ updateSchemaRefs(extSchema.getSchema(), name);
}
}
}