Author: asankha
Date: Thu Oct 26 00:48:12 2006
New Revision: 467898
URL: http://svn.apache.org/viewvc?view=rev&rev=467898
Log:
sync-up with latest axis2 1.1 changes
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseMustUnderstandHandler.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/metrics/GlobalRequestCountHandler.java
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/SynapseJsonSender.java
incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/AsyncHTTPSender.java
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseMustUnderstandHandler.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseMustUnderstandHandler.java?view=diff&rev=467898&r1=467897&r2=467898
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseMustUnderstandHandler.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseMustUnderstandHandler.java
Thu Oct 26 00:48:12 2006
@@ -28,22 +28,22 @@
public class SynapseMustUnderstandHandler extends AbstractHandler {
- public void invoke(MessageContext msgContext) throws AxisFault {
+ public InvocationResponse invoke(MessageContext msgContext) throws
AxisFault {
Object obj = msgContext.getProperty(
org.apache.synapse.Constants.PROCESSED_MUST_UNDERSTAND);
if (obj != null && ((Boolean) obj).booleanValue()) {
// second phase so return
- return;
+ return InvocationResponse.CONTINUE;
}
msgContext.setProperty(
org.apache.synapse.Constants.PROCESSED_MUST_UNDERSTAND,
Boolean.TRUE);
if (!msgContext.isHeaderPresent()) {
- return;
+ return InvocationResponse.CONTINUE;
}
SOAPEnvelope envelope = msgContext.getEnvelope();
if (envelope.getHeader() == null) {
- return;
+ return InvocationResponse.CONTINUE;
}
Iterator headerBlocks = envelope.getHeader().examineAllHeaderBlocks();
while (headerBlocks.hasNext()) {
@@ -56,6 +56,6 @@
headerBlock.setProcessed();
}
-
+ return InvocationResponse.CONTINUE;
}
}
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/metrics/GlobalRequestCountHandler.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/metrics/GlobalRequestCountHandler.java?view=diff&rev=467898&r1=467897&r2=467898
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/metrics/GlobalRequestCountHandler.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/metrics/GlobalRequestCountHandler.java
Thu Oct 26 00:48:12 2006
@@ -26,11 +26,12 @@
public class GlobalRequestCountHandler extends AbstractHandler {
- public void invoke(MessageContext msgContext) throws AxisFault {
+ public InvocationResponse invoke(MessageContext msgContext) throws
AxisFault {
msgContext
.setProperty(Constants.REQUEST_RECEIVED_TIME, new
Long(System.currentTimeMillis()));
// global increment
((Counter)
msgContext.getParameter(Constants.GLOBAL_REQUEST_COUNTER).getValue())
.increment();
+ return InvocationResponse.CONTINUE;
}
}
Modified:
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/SynapseJsonSender.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/SynapseJsonSender.java?view=diff&rev=467898&r1=467897&r2=467898
==============================================================================
---
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/SynapseJsonSender.java
(original)
+++
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/SynapseJsonSender.java
Thu Oct 26 00:48:12 2006
@@ -45,7 +45,7 @@
private static final Log log = LogFactory.getLog(SynapseJsonSender.class);
- public void invoke(MessageContext msgContext) throws AxisFault {
+ public InvocationResponse invoke(MessageContext msgContext) throws
AxisFault {
//Fix Me For Sending Only
// Trasnport URL can be different from the WSA-To. So processing
// that now.
@@ -119,7 +119,7 @@
throw new AxisFault(e);
}
-
+ return InvocationResponse.CONTINUE;
}
public void cleanup(MessageContext msgContext) throws AxisFault {
Modified:
incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/AsyncHTTPSender.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/AsyncHTTPSender.java?view=diff&rev=467898&r1=467897&r2=467898
==============================================================================
---
incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/AsyncHTTPSender.java
(original)
+++
incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/AsyncHTTPSender.java
Thu Oct 26 00:48:12 2006
@@ -44,7 +44,7 @@
*/
public class AsyncHTTPSender extends AbstractHandler implements
TransportSender {
- public void invoke(MessageContext msgContext) throws AxisFault {
+ public InvocationResponse invoke(MessageContext msgContext) throws
AxisFault {
OMOutputFormat format = new OMOutputFormat();
String charSetEnc = (String) msgContext.getProperty(
@@ -130,6 +130,8 @@
.setProperty(Constants.RESPONSE_WRITTEN,
Constants.VALUE_TRUE);
}
+
+ return InvocationResponse.CONTINUE;
}
private void sendAsyncResponse(MessageContext msgContext, OMOutputFormat
format, OMElement dataOut) throws AxisFault {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
