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 du...@apache.org on 2006/02/20 19:35:24 UTC
svn commit: r379193 - in
/webservices/axis/trunk/proposals/dug/java/src/org/apache/axis:
server/AxisServer.java wsa/MIHeader.java wsa/WSAHandler.java
Author: dug
Date: Mon Feb 20 10:35:22 2006
New Revision: 379193
URL: http://svn.apache.org/viewcvs?rev=379193&view=rev
Log:
Get TCK test working - who wudda thunk that calling
msg.getSOAPPart().getEnvelope() would be so different from calling
msg.getSOAPEnvelope()
Modified:
webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/server/AxisServer.java
webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/wsa/MIHeader.java
webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/wsa/WSAHandler.java
Modified: webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/server/AxisServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/server/AxisServer.java?rev=379193&r1=379192&r2=379193&view=diff
==============================================================================
--- webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/server/AxisServer.java (original)
+++ webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/server/AxisServer.java Mon Feb 20 10:35:22 2006
@@ -39,6 +39,7 @@
import org.apache.axis.message.SOAPHeaderElement;
import org.apache.axis.wsrm.RMInterface ;
import org.apache.axis.wsa.MIHeader;
+import org.apache.axis.wsa.WSAConstants;
import org.apache.axis.wsa.WSAHandler;
import java.util.Map;
@@ -264,8 +265,7 @@
// If WSA isn't turned on then just rethrow it
// Dug - fix this, it should not do this we need to make this
// work even when WSA is turned on
- if ( MIHeader.fromRequest() == null ) throw exp ;
-
+ if ( msgContext.getProperty(WSAConstants.REQ_MIH) == null ) throw exp ;
if ( !(exp instanceof AxisFault) )
exp = AxisFault.makeFault( exp );
Modified: webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/wsa/MIHeader.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/wsa/MIHeader.java?rev=379193&r1=379192&r2=379193&view=diff
==============================================================================
--- webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/wsa/MIHeader.java (original)
+++ webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/wsa/MIHeader.java Mon Feb 20 10:35:22 2006
@@ -119,7 +119,7 @@
if ( msg == null ) return null ;
mih = new MIHeader();
mih.removeOnGet = false ;
- mih.fromEnvelope( (SOAPEnvelope) msg.getSOAPPart().getEnvelope() );
+ mih.fromEnvelope( (SOAPEnvelope) msg.getSOAPEnvelope() );
if ( mih.getTo() == null && mih.getFrom() == null) return null ;
msgContext.setProperty( WSAConstants.REQ_MIH, mih );
}
@@ -140,7 +140,7 @@
if ( msg == null ) return null ;
mih = new MIHeader();
mih.removeOnGet = false ;
- mih.fromEnvelope( (SOAPEnvelope) msg.getSOAPPart().getEnvelope() );
+ mih.fromEnvelope( (SOAPEnvelope) msg.getSOAPEnvelope() );
if ( mih.getTo() == null && mih.getFrom() == null ) return null ;
msgContext.setProperty(WSAConstants.RES_MIH, mih );
}
Modified: webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/wsa/WSAHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/wsa/WSAHandler.java?rev=379193&r1=379192&r2=379193&view=diff
==============================================================================
--- webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/wsa/WSAHandler.java (original)
+++ webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/wsa/WSAHandler.java Mon Feb 20 10:35:22 2006
@@ -14,7 +14,7 @@
public class WSAHandler { // extends BasicHandler {
- public static void invoke(MessageContext msgContext) throws AxisFault {
+ public static void invoke(MessageContext msgContext) throws Exception {
boolean onClient = true;
boolean request = true;
@@ -33,25 +33,19 @@
onClient = false;
}
- try {
- if (onClient && request ) {
- // Process client request
- processClientRequest(msgContext);
- } else if (onClient && !request) {
- // Process client response
- processClientResponse(msgContext);
- } else if (!onClient && request) {
- // Process server request
- processServerRequest(msgContext);
- } else if (!onClient && !request) {
- // Process server response
- processServerResponse(msgContext);
- }
- } catch (Exception e) {
- e.printStackTrace();
- throw new AxisFault(e.getMessage());
+ if (onClient && request ) {
+ // Process client request
+ processClientRequest(msgContext);
+ } else if (onClient && !request) {
+ // Process client response
+ processClientResponse(msgContext);
+ } else if (!onClient && request) {
+ // Process server request
+ processServerRequest(msgContext);
+ } else if (!onClient && !request) {
+ // Process server response
+ processServerResponse(msgContext);
}
-
}
static void processClientRequest(MessageContext msgContext) throws Exception {