Author: indika
Date: Wed Feb 25 08:17:43 2009
New Revision: 747703
URL: http://svn.apache.org/viewvc?rev=747703&view=rev
Log:
SALB endpoint fixes
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java?rev=747703&r1=747702&r2=747703&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
Wed Feb 25 08:17:43 2009
@@ -82,19 +82,19 @@
/**
* Holds Proxy services defined through Synapse
*/
- private Map<String, ProxyService> proxyServices = new HashMap<String,
ProxyService>();
+ private final Map<String, ProxyService> proxyServices = new
HashMap<String, ProxyService>();
/**
* This holds a Map of ManagedLifecycle objects
*/
- private Map<String, Startup> startups = new HashMap<String, Startup>();
+ private final Map<String, Startup> startups = new HashMap<String,
Startup>();
/**
* The local registry is a simple HashMap and provides the ability to
* override definitions of a remote registry for entries defined locally
* with the same key
*/
- private Map<String, Object> localRegistry = new HashMap<String,
Object>();
+ private final Map<String, Object> localRegistry = new HashMap<String,
Object>();
/** Holds the synapse properties */
private Properties properties = new Properties();
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java?rev=747703&r1=747702&r2=747703&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
Wed Feb 25 08:17:43 2009
@@ -35,6 +35,7 @@
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.endpoints.EndpointDefinition;
+import org.apache.synapse.endpoints.dispatch.Dispatcher;
import org.apache.synapse.mediators.MediatorWorker;
import org.apache.synapse.mediators.base.SequenceMediator;
import org.apache.synapse.commons.util.TemporaryData;
@@ -202,6 +203,15 @@
Axis2Sender.sendBack(synCtx);
}
} else {
+ // If this request is related to session affinity endpoints - For
client initiated session
+ Dispatcher dispatcher =
+ (Dispatcher) synCtx.getProperty(
+
SynapseConstants.PROP_SAL_ENDPOINT_CURRENT_DISPATCHER);
+ if (dispatcher != null) {
+ if (!dispatcher.isServerInitiatedSession()) {
+ dispatcher.updateSession(synCtx);
+ }
+ }
Axis2Sender.sendOn(endpoint, synCtx);
}
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java?rev=747703&r1=747702&r2=747703&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
Wed Feb 25 08:17:43 2009
@@ -256,8 +256,7 @@
} catch (IOException e) {
//handleException("Error reading from wsdl URI", e);
boolean enablePublishWSDLSafeMode = false;
- Map proxyParameters = null;
- proxyParameters = this.getParameterMap();
+ Map proxyParameters= this.getParameterMap();
if (!proxyParameters.isEmpty()) {
if
(proxyParameters.containsKey("enablePublishWSDLSafeMode")) {
enablePublishWSDLSafeMode =
@@ -331,7 +330,6 @@
+ wsdlNamespace.getNamespaceURI());
if (wsdlNamespace != null) {
- boolean isWSDL11 = false;
WSDLToAxisServiceBuilder wsdlToAxisServiceBuilder =
null;
if (WSDL2Constants.WSDL_NAMESPACE.
@@ -343,7 +341,6 @@
equals(wsdlNamespace.getNamespaceURI())) {
wsdlToAxisServiceBuilder =
new
WSDL11ToAxisServiceBuilder(wsdlInputStream);
- isWSDL11 = true;
} else {
handleException("Unknown WSDL format.. not WSDL
1.1 or WSDL 2.0");
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java?rev=747703&r1=747702&r2=747703&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
Wed Feb 25 08:17:43 2009
@@ -308,6 +308,13 @@
(String) key, synapseOutMsgCtx.getProperty((String)
key));
}
+ // If this response is related to session affinity endpoints
-Server initiated session
+ Dispatcher dispatcher =
+ (Dispatcher) synapseOutMsgCtx.getProperty(
+
SynapseConstants.PROP_SAL_ENDPOINT_CURRENT_DISPATCHER);
+ if (dispatcher != null && dispatcher.isServerInitiatedSession()) {
+ dispatcher.updateSession(synapseInMessageContext);
+ }
// send the response message through the synapse mediation flow
try {
synapseOutMsgCtx.getEnvironment().injectMessage(synapseInMessageContext);
