Author: gatfora
Date: Wed Mar 28 00:52:38 2007
New Revision: 523216
URL: http://svn.apache.org/viewvc?view=rev&rev=523216
Log:
Exceptions caught when processing SenderWorker.checkForSyncResponses should log
a warning and not throw the exception otherwise Terminate processing does not
complete for RM1.0
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/InvokerWorker.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/InvokerWorker.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/InvokerWorker.java?view=diff&rev=523216&r1=523215&r2=523216
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/InvokerWorker.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/InvokerWorker.java
Wed Mar 28 00:52:38 2007
@@ -1,11 +1,11 @@
package org.apache.sandesha2.workers;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.util.MessageContextBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -180,8 +180,8 @@
try {
MessageContext faultContext =
MessageContextBuilder.createFaultMessageContext(inMsgContext, e);
// Copy some of the parameters to the new message
context.
- faultContext.setProperty(HTTPConstants.CONTENT_TYPE,
inMsgContext
-
.getProperty(HTTPConstants.CONTENT_TYPE));
+
faultContext.setProperty(Constants.Configuration.CONTENT_TYPE, inMsgContext
+
.getProperty(Constants.Configuration.CONTENT_TYPE));
engine.sendFault(faultContext);
} catch (AxisFault e1) {
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java?view=diff&rev=523216&r1=523215&r2=523216
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java
Wed Mar 28 00:52:38 2007
@@ -3,11 +3,10 @@
import java.util.ArrayList;
import java.util.Iterator;
-import javax.xml.namespace.QName;
-
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
@@ -448,7 +447,7 @@
return piggybackable;
}
- private void checkForSyncResponses(MessageContext msgCtx) throws
SandeshaException {
+ private void checkForSyncResponses(MessageContext msgCtx) {
if (log.isDebugEnabled())
log.debug("Enter: SenderWorker::checkForSyncResponses,
" + msgCtx.getEnvelope().getHeader());
@@ -490,8 +489,8 @@
.getProperty(HTTPConstants.MTOM_RECEIVED_CONTENT_TYPE));
responseMessageContext.setProperty(HTTPConstants.CHAR_SET_ENCODING,
requestMsgOpCtx
.getProperty(HTTPConstants.CHAR_SET_ENCODING));
-
responseMessageContext.setProperty(HTTPConstants.CONTENT_TYPE, requestMsgOpCtx
-
.getProperty(HTTPConstants.CONTENT_TYPE));
+
responseMessageContext.setProperty(Constants.Configuration.CONTENT_TYPE,
requestMsgOpCtx
+
.getProperty(Constants.Configuration.CONTENT_TYPE));
// If request is REST we assume the
responseMessageContext is REST,
// so set the variable
@@ -554,8 +553,6 @@
(Sandesha2Constants.MessageTypes.ACK, responseRMMessage.getRMSpecVersion(),
responseMessageContext.getAxisService()));
responseMessageContext.setOperationContext(null);
}
-
-
AxisEngine engine = new
AxisEngine(msgCtx.getConfigurationContext());
@@ -568,8 +565,8 @@
} catch (Exception e) {
String message =
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.noValidSyncResponse);
- log.debug(message, e);
- throw new SandeshaException(message, e);
+ if (log.isWarnEnabled())
+ log.warn(message, e);
}
if (log.isDebugEnabled())
log.debug("Exit: SenderWorker::checkForSyncResponses");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
