svn commit: r1356082 - in /axis/axis2/java/core/branches/1_6: ./ modules/kernel/src/org/apache/axis2/description/AxisService.java modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java

[sagara]

Author: sagara
Date: Mon Jul  2 06:48:55 2012
New Revision: 1356082

URL: http://svn.apache.org/viewvc?rev=1356082&view=rev
Log:
AXIS2-5355 - Merged r1356080 to 1.6 branch.

Modified:
    axis/axis2/java/core/branches/1_6/   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/AxisService.java
    
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java

Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
  Merged /axis/axis2/java/core/trunk:r1356080

Modified: 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/AxisService.java?rev=1356082&r1=1356081&r2=1356082&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/AxisService.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/AxisService.java
 Mon Jul  2 06:48:55 2012
@@ -1314,9 +1314,10 @@ public class AxisService extends AxisDes
         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);
                 }
             }

Modified: 
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java?rev=1356082&r1=1356081&r2=1356082&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
 Mon Jul  2 06:48:55 2012
@@ -202,9 +202,10 @@ public class HTTPWorker implements Worke
                     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);
                         }
                     }