Author: hiranya
Date: Wed Jul 24 20:11:35 2013
New Revision: 1506689
URL: http://svn.apache.org/r1506689
Log:
Not trying to send a fault for connections that are already done
Modified:
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/rest/Sample800.java
synapse/trunk/java/modules/integration/src/test/resources/sample800.xml
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetErrorHandler.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/connections/HostConnections.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/connections/TargetConnections.java
Modified:
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/rest/Sample800.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/rest/Sample800.java?rev=1506689&r1=1506688&r2=1506689&view=diff
==============================================================================
---
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/rest/Sample800.java
(original)
+++
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/rest/Sample800.java
Wed Jul 24 20:11:35 2013
@@ -51,5 +51,7 @@ public class Sample800 extends SynapseTe
HttpResponse response =
client.doPost("http://127.0.0.1:8280/stockquote/order";,
payload.getBytes(), "application/xml");
assertEquals(response.getStatus(), HttpStatus.SC_ACCEPTED);
+ Thread.sleep(2000);
+ assertEquals(1,
getAxis2Server().getMessageCount("SimpleStockQuoteService", "placeOrder"));
}
}
Modified:
synapse/trunk/java/modules/integration/src/test/resources/sample800.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/resources/sample800.xml?rev=1506689&r1=1506688&r2=1506689&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/resources/sample800.xml
(original)
+++ synapse/trunk/java/modules/integration/src/test/resources/sample800.xml Wed
Jul 24 20:11:35 2013
@@ -11,6 +11,7 @@
<axis2Server id='0'>
<axis2Repo>modules/integration/target/test_repos/axis2Server</axis2Repo>
<axis2Xml>modules/integration/target/test_repos/axis2Server/conf/axis2_def.xml</axis2Xml>
+ <counterEnabled>true</counterEnabled>
</axis2Server>
</backEndServerConfig>
<clientConfig>
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java?rev=1506689&r1=1506688&r2=1506689&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java
Wed Jul 24 20:11:35 2013
@@ -116,7 +116,7 @@ public class PassThroughHttpSender exten
TransportOutDescription transportOutDescription) throws
AxisFault {
if (log.isDebugEnabled()) {
- log.debug("Initializing Pass-through HTTP/S Sender...");
+ log.debug("Initializing pass-through HTTP/S sender...");
}
// is this an SSL Sender?
@@ -147,7 +147,7 @@ public class PassThroughHttpSender exten
proxyBypassList =
(System.getProperty("http.nonProxyHosts")).split("\\|");
}
- log.info("HTTP Sender using Proxy : "
+ log.info("HTTP sender using Proxy : "
+ proxyHost + ":" + proxyPort + " bypassing : " +
Arrays.toString(proxyBypassList));
}
}
@@ -223,10 +223,10 @@ public class PassThroughHttpSender exten
try {
ioReactor.execute(ioEventDispatch);
} catch (Exception ex) {
- log.fatal("Exception encountered in the " + namePrefix + "
Sender. " +
+ log.fatal("Exception encountered in the " + namePrefix + "
sender. " +
"No more connections will be initiated by this
transport", ex);
}
- log.info(namePrefix + " Sender shutdown");
+ log.info(namePrefix + " sender shutdown");
}
}, "PassThrough" + namePrefix + "Sender");
t.start();
@@ -316,7 +316,7 @@ public class PassThroughHttpSender exten
} catch (Exception e) {
handleException("Failed to submit the response", e);
}
- }else {
+ } else {
//handleException("No valid destination EPR to send
message");
//should be able to handle sendUsingOutputStream Ref
NHTTP_NIO
sendUsingOutputStream(msgContext);
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetErrorHandler.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetErrorHandler.java?rev=1506689&r1=1506688&r2=1506689&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetErrorHandler.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetErrorHandler.java
Wed Jul 24 20:11:35 2013
@@ -21,6 +21,7 @@ package org.apache.synapse.transport.pas
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.util.MessageContextBuilder;
@@ -59,7 +60,10 @@ public class TargetErrorHandler {
}
if (mc.getAxisOperation() == null ||
- mc.getAxisOperation().getMessageReceiver() == null) {
+ mc.getAxisOperation().getMessageReceiver() == null ||
+ (mc.getOperationContext() != null &&
+
Constants.VALUE_TRUE.equals(mc.getOperationContext().getProperty(
+ Constants.RESPONSE_WRITTEN)))) {
return;
}
@@ -77,7 +81,7 @@ public class TargetErrorHandler {
SOAPEnvelope envelope = faultMessageContext.getEnvelope();
if (log.isDebugEnabled()) {
- log.debug("Sending Fault for Request with Message ID :
"
+ log.debug("Sending fault for request with message ID :
"
+ mc.getMessageID());
}
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/connections/HostConnections.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/connections/HostConnections.java?rev=1506689&r1=1506688&r2=1506689&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/connections/HostConnections.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/connections/HostConnections.java
Wed Jul 24 20:11:35 2013
@@ -34,6 +34,7 @@ import java.util.concurrent.locks.Reentr
* This stores connections for a particular host + port.
*/
public class HostConnections {
+
private static final Log log = LogFactory.getLog(HostConnections.class);
// host
private String host;
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/connections/TargetConnections.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/connections/TargetConnections.java?rev=1506689&r1=1506688&r2=1506689&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/connections/TargetConnections.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/connections/TargetConnections.java
Wed Jul 24 20:11:35 2013
@@ -38,6 +38,7 @@ import java.net.InetSocketAddress;
* connections for host:port pair.
*/
public class TargetConnections {
+
private static final Log log = LogFactory.getLog(TargetConnections.class);
/** map to hold the ConnectionPools. The key is host:port */
