You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by bi...@apache.org on 2020/04/14 20:02:47 UTC
[axis-axis2-java-core] 35/38: AXIS2-5355 - Merged r1356080 to 1.5
branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit afa04b28001641358afd6c96d62ee043316b5f6d
Author: Sagara Gunathunga <sa...@apache.org>
AuthorDate: Mon Jul 2 06:52:19 2012 +0000
AXIS2-5355 - Merged r1356080 to 1.5 branch.
---
modules/kernel/src/org/apache/axis2/description/AxisService.java | 3 ++-
.../transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/modules/kernel/src/org/apache/axis2/description/AxisService.java b/modules/kernel/src/org/apache/axis2/description/AxisService.java
index 58f73cc..8866154 100644
--- a/modules/kernel/src/org/apache/axis2/description/AxisService.java
+++ b/modules/kernel/src/org/apache/axis2/description/AxisService.java
@@ -1260,9 +1260,10 @@ public class AxisService extends AxisDescription {
if ((xsd != null) && (!"".equals(xsd))) {
XmlSchema schema = (XmlSchema) schemaMappingtable.get(xsd);
if (schema == null) {
- int dotIndex = xsd.indexOf('.');
+ int dotIndex = xsd.lastIndexOf('.');
if (dotIndex > 0) {
String schemaKey = xsd.substring(0, dotIndex);
+ schemaKey = schemaKey.replace("./" , "");
schema = (XmlSchema) schemaMappingtable.get(schemaKey);
}
}
diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java b/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
index 4d30dea..186a110 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
@@ -161,9 +161,10 @@ public class HTTPWorker implements Worker {
Map schemaTable = service.getSchemaMappingTable();
XmlSchema schema = (XmlSchema) schemaTable.get(schemaName);
if (schema == null) {
- int dotIndex = schemaName.indexOf('.');
+ int dotIndex = schemaName.lastIndexOf('.');
if (dotIndex > 0) {
String schemaKey = schemaName.substring(0,dotIndex);
+ schemaKey = schemaKey.replace("./", "");
schema = (XmlSchema) schemaTable.get(schemaKey);
}
}