Author: asankha
Date: Wed Oct 3 03:01:33 2007
New Revision: 581551
URL: http://svn.apache.org/viewvc?rev=581551&view=rev
Log:
fix synchronization problem in Axiom XPath expression for filter mediator
Fix HTTP 1.0 force bug where it was on by default
Use correct constant for transport HTTPS
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/ServerWorker.java
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java?rev=581551&r1=581550&r2=581551&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
Wed Oct 3 03:01:33 2007
@@ -404,6 +404,8 @@
*/
public static String getStringValue(AXIOMXPath xpath, MessageContext
synCtx) {
+ synchronized(xpath) {
+
if (xpath != null) {
try {
// create an instance of a synapse:get-property() function and
set it to the xpath
@@ -461,6 +463,7 @@
handleException("Invalid (null) XPath expression");
}
return null;
+ }
}
private static void handleException(String msg, Exception e) {
Modified:
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java?rev=581551&r1=581550&r2=581551&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java
(original)
+++
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java
Wed Oct 3 03:01:33 2007
@@ -100,8 +100,7 @@
public HttpRequest getRequest() throws IOException {
HttpEntityEnclosingRequest httpRequest = null;
- if(!Utils.isExplicitlyTrue(msgContext, NhttpConstants.FORCE_HTTP_1_0))
- {
+ if (msgContext.isPropertyTrue(NhttpConstants.FORCE_HTTP_1_0)) {
httpRequest = new BasicHttpEntityEnclosingRequest(
"POST", epr.getAddress(), HttpVersion.HTTP_1_0);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
Modified:
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/ServerWorker.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/ServerWorker.java?rev=581551&r1=581550&r2=581551&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/ServerWorker.java
(original)
+++
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/ServerWorker.java
Wed Oct 3 03:01:33 2007
@@ -20,6 +20,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.context.ConfigurationContext;
@@ -123,10 +124,10 @@
msgContext.setConfigurationContext(cfgCtx);
if (isHttps) {
msgContext.setTransportOut(cfgCtx.getAxisConfiguration()
- .getTransportOut("https"));
+ .getTransportOut(Constants.TRANSPORT_HTTPS));
msgContext.setTransportIn(cfgCtx.getAxisConfiguration()
- .getTransportIn("https"));
- msgContext.setIncomingTransportName("https");
+ .getTransportIn(Constants.TRANSPORT_HTTPS));
+ msgContext.setIncomingTransportName(Constants.TRANSPORT_HTTPS);
} else {
msgContext.setTransportOut(cfgCtx.getAxisConfiguration()
.getTransportOut(Constants.TRANSPORT_HTTP));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
