Author: dushan
Date: Sun May 29 03:06:31 2016
New Revision: 1745967
URL: http://svn.apache.org/viewvc?rev=1745967&view=rev
Log:
merge fix https://issues.apache.org/jira/browse/SYNAPSE-1024
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/DeliveryAgent.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughConstants.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/DeliveryAgent.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/DeliveryAgent.java?rev=1745967&r1=1745966&r2=1745967&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/DeliveryAgent.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/DeliveryAgent.java
Sun May 29 03:06:31 2016
@@ -216,8 +216,8 @@ public class DeliveryAgent {
PassThroughConstants.MESSAGE_BUILDER_INVOKED))) {
synchronized (msgContext) {
OutputStream out = pipe.getOutputStream();
- msgContext.setProperty("GET_ME_OUT", out);
- msgContext.setProperty("READY2ROCK", Boolean.TRUE);
+
msgContext.setProperty(PassThroughConstants.BUILDER_OUTPUT_STREAM, out);
+
msgContext.setProperty(PassThroughConstants.WAIT_BUILDER_IN_STREAM_COMPLETE,
Boolean.TRUE);
msgContext.notifyAll();
}
return;
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughConstants.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughConstants.java?rev=1745967&r1=1745966&r2=1745967&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughConstants.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughConstants.java
Sun May 29 03:06:31 2016
@@ -125,7 +125,14 @@ public class PassThroughConstants {
public static final String FORCE_PASS_THROUGH_BUILDER =
"force.passthrough.builder";
public static final String GET_REQUEST_HANDLED = "GET_REQUEST_HANDLED";
+
+ public static final String
WAIT_BUILDER_IN_STREAM_COMPLETE="WAIT_BUILDER_IN_STREAM_COMPLETE";
+
+ public static final String
BUILDER_OUTPUT_STREAM="BUILDER_OUTPUT_STREAM";
+
+ public static final String
PASSTHRU_CONNECT_ERROR="PASSTHRU_CONNECT_ERROR";
public static final String
COPY_CONTENT_LENGTH_FROM_INCOMING="COPY_CONTENT_LENGTH_FROM_INCOMING";
+
public static final String ORIGINAL_CONTENT_LENGTH
="ORIGINAL_CONTENT_LENGTH";
}
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=1745967&r1=1745966&r2=1745967&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
Sun May 29 03:06:31 2016
@@ -375,8 +375,8 @@ public class PassThroughHttpSender exten
if
(Boolean.TRUE.equals(msgContext.getProperty(PassThroughConstants.MESSAGE_BUILDER_INVOKED)))
{
synchronized (msgContext) {
- while
(!Boolean.TRUE.equals(msgContext.getProperty("READY2ROCK")) &&
-
!Boolean.TRUE.equals(msgContext.getProperty("PASSTHRU_CONNECT_ERROR"))) {
+ while
(!Boolean.TRUE.equals(msgContext.getProperty(PassThroughConstants.WAIT_BUILDER_IN_STREAM_COMPLETE))
&&
+
!Boolean.TRUE.equals(msgContext.getProperty(PassThroughConstants.PASSTHRU_CONNECT_ERROR)))
{
try {
msgContext.wait();
} catch (InterruptedException e) {
