svn commit: r1081273 - in /axis/axis2/java/core/branches/1_6/modules: adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java

[sagara]

Author: sagara
Date: Mon Mar 14 07:33:22 2011
New Revision: 1081273

URL: http://svn.apache.org/viewvc?rev=1081273&view=rev
Log:
Merged changes of r1072499 to the 1.6 branch.

Modified:
    
axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
    
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java

Modified: 
axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java?rev=1081273&r1=1081272&r2=1081273&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
 Mon Mar 14 07:33:22 2011
@@ -174,7 +174,7 @@ public class RPCMessageReceiver extends 
             for (Class exceptionType : exceptionTypes){
                 if 
(exceptionType.getName().equals(cause.getClass().getName())){
                     // this is an bussiness logic exception so handle it 
properly
-                    String partQName = method.getName() + 
getSimpleClassName(exceptionType);
+                    String partQName = inMessage.getAxisService().getName() + 
getSimpleClassName(exceptionType);
                     TypeTable typeTable = 
inMessage.getAxisService().getTypeTable();
                     QName elementQName = 
typeTable.getQNamefortheType(partQName);
                     SOAPFactory fac = getSOAPFactory(inMessage);

Modified: 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java?rev=1081273&r1=1081272&r2=1081273&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
 Mon Mar 14 07:33:22 2011
@@ -443,7 +443,7 @@ public class DefaultSchemaGenerator impl
                 if (AxisFault.class.getName().equals(extype.getName())) {
                     continue;
                 }
-                String partQname = jMethod.getName() + 
getSimpleClassName(extype);
+                String partQname = this.service.getName() + 
getSimpleClassName(extype);
                 methodSchemaType = createSchemaTypeForFault(partQname);
                 QName elementName =
                         new QName(this.schemaTargetNameSpace, partQname, 
this.schema_namespace_prefix);
@@ -473,7 +473,7 @@ public class DefaultSchemaGenerator impl
                     continue;
                 }
                 AxisMessage faultMessage = new AxisMessage();
-                faultMessage.setName(jMethod.getName() + 
getSimpleClassName(extype));
+                faultMessage.setName(this.service.getName() + 
getSimpleClassName(extype));
                 
faultMessage.setElementQName(typeTable.getQNamefortheType(partQname));
                 axisOperation.setFaultMessages(faultMessage);
             }