You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by gd...@apache.org on 2001/03/08 23:08:51 UTC
cvs commit: xml-axis/java/src/org/apache/axis/handlers RPCDispatchHandler.java MsgDispatchHandler.java
gdaniels 01/03/08 14:08:50
Modified: java/src/org/apache/axis/handlers RPCDispatchHandler.java
MsgDispatchHandler.java
Log:
If there's already a response message in the MessageContext, use
that instead of making a new one. This allows Handlers to build up
pieces of the response and have them all combined nicely.
Revision Changes Path
1.18 +10 -7 xml-axis/java/src/org/apache/axis/handlers/RPCDispatchHandler.java
Index: RPCDispatchHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/RPCDispatchHandler.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- RPCDispatchHandler.java 2001/03/08 01:15:18 1.17
+++ RPCDispatchHandler.java 2001/03/08 22:08:49 1.18
@@ -89,9 +89,12 @@
Class cls = cl.loadClass(clsName);
Object obj = cls.newInstance();
Message inMsg = msgContext.getRequestMessage();
+ Message outMsg = msgContext.getResponseMessage();
SOAPEnvelope env = (SOAPEnvelope) inMsg.getAs("SOAPEnvelope");
Vector bodies = env.getAsRPCBody();
- SOAPEnvelope resEnv = null ;
+ SOAPEnvelope resEnv = (outMsg == null) ?
+ new SOAPEnvelope() :
+ (SOAPEnvelope)outMsg.getAs("SOAPEnvelope");
/* Loop over each entry in the SOAPBody - each one is a different */
/* RPC call. */
@@ -121,10 +124,8 @@
Method method = cls.getMethod( mName, argClasses );
Object objRes = method.invoke( obj, argValues );
- /* Now put the result in a result SOAPEnvelope */
- /***********************************************/
- if ( resEnv == null )
- resEnv = new SOAPEnvelope();
+ /* Now put the result in the result SOAPEnvelope */
+ /*************************************************/
RPCBody resBody = new RPCBody();
resBody.setMethodName( mName + "Response" );
resBody.setPrefix( body.getPrefix() );
@@ -136,8 +137,10 @@
resEnv.addBody( resBody.getAsSOAPBody() );
}
- Message outMsg = new Message( resEnv, "SOAPEnvelope" );
- msgContext.setResponseMessage( outMsg );
+ if (outMsg == null) {
+ outMsg = new Message(resEnv, "SOAPEnvelope");
+ msgContext.setResponseMessage( outMsg );
+ }
}
catch( Exception e ) {
Debug.Print( 1, e );
1.9 +11 -3 xml-axis/java/src/org/apache/axis/handlers/MsgDispatchHandler.java
Index: MsgDispatchHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/MsgDispatchHandler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MsgDispatchHandler.java 2001/03/03 01:07:04 1.8
+++ MsgDispatchHandler.java 2001/03/08 22:08:49 1.9
@@ -99,6 +99,11 @@
Message reqMsg = msgContext.getRequestMessage();
SOAPEnvelope reqEnv = (SOAPEnvelope) reqMsg.getAs("SOAPEnvelope");
SOAPBody reqBody = reqEnv.getFirstBody();
+ Message resMsg = msgContext.getResponseMessage();
+ SOAPEnvelope resEnv = (resMsg == null) ?
+ new SOAPEnvelope() :
+ (SOAPEnvelope)resMsg.getAs("SOAPEnvelope");
+
Document doc = new Document( reqBody.getAsXML() );
argClasses[0] = cl.loadClass("org.apache.axis.MessageContext");
@@ -111,9 +116,12 @@
Document retDoc = (Document) method.invoke( obj, argObjects );
SOAPBody resBody = new SOAPBody( retDoc );
- SOAPEnvelope resEnv = new SOAPEnvelope( resBody );
- Message resMsg = new Message( resEnv, "SOAPEnvelope" );
- msgContext.setResponseMessage( resMsg );
+ resEnv.addBody(resBody);
+
+ if (resMsg == null) {
+ resMsg = new Message(resEnv, "SOAPEnvelope");
+ msgContext.setResponseMessage( resMsg );
+ }
}
catch( Exception exp ) {
exp.printStackTrace();