Author: indika
Date: Thu Dec 13 21:28:29 2007
New Revision: 604107
URL: http://svn.apache.org/viewvc?rev=604107&view=rev
Log:
exclude the axis2.jar
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SimpleClientSessionDispatcher.java
webservices/synapse/trunk/java/pom.xml
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SimpleClientSessionDispatcher.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SimpleClientSessionDispatcher.java?rev=604107&r1=604106&r2=604107&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SimpleClientSessionDispatcher.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SimpleClientSessionDispatcher.java
Thu Dec 13 21:28:29 2007
@@ -47,13 +47,19 @@
SOAPHeader header = synCtx.getEnvelope().getHeader();
- if(header != null) {
- OMElement csID = header.getFirstChildWithName(
- new QName("http://ws.apache.org/namespaces/synapse";,
"ClientID", "syn"));
- if(csID != null && csID.getText() != null) {
- Object o = sessionMap.get(csID.getText());
- if (o != null) {
- return (Endpoint) o;
+ if (header != null) {
+ OMElement sgcIDElm = header.getFirstChildWithName(
+ new QName("http://ws.apache.org/namespaces/synapse";,
"ClientID", "syn"));
+
+ if (sgcIDElm != null) {
+ String sgcID = sgcIDElm.getText();
+
+ if (sgcID != null) {
+ Object o = sessionMap.get(sgcID);
+
+ if (o != null) {
+ return (Endpoint) o;
+ }
}
}
}
@@ -65,14 +71,19 @@
SOAPHeader header = synCtx.getEnvelope().getHeader();
- if(header != null) {
- OMElement csID = header.getFirstChildWithName(
- new QName("http://ws.apache.org/namespaces/synapse";,
"ClientID", "syn"));
- if(csID != null && csID.getText() != null) {
- // synchronized to avoid possible replacement of sessions
- synchronized(sessionMap) {
- if (!sessionMap.containsKey(csID.getText())) {
- sessionMap.put(csID.getText(), endpoint);
+ if (header != null) {
+ OMElement csIDElm = header.getFirstChildWithName(
+ new QName("http://ws.apache.org/namespaces/synapse";,
"ClientID", "syn"));
+
+ if (csIDElm != null) {
+ String csID = csIDElm.getText();
+
+ if (csID != null) {
+ // synchronized to avoid possible replacement of sessions
+ synchronized (sessionMap) {
+ if (!sessionMap.containsKey(csID)) {
+ sessionMap.put(csID, endpoint);
+ }
}
}
}
@@ -83,11 +94,16 @@
SOAPHeader header = synCtx.getEnvelope().getHeader();
- if(header != null) {
- OMElement csID = header.getFirstChildWithName(
- new QName("http://ws.apache.org/namespaces/synapse";,
"ClientID", "syn"));
- if(csID != null && csID.getText() != null) {
- sessionMap.remove(csID.getText());
+ if (header != null) {
+ OMElement csIDElm = header.getFirstChildWithName(
+ new QName("http://ws.apache.org/namespaces/synapse";,
"ClientID", "syn"));
+
+ if (csIDElm != null) {
+ String csID = csIDElm.getText();
+
+ if (csID != null) {
+ sessionMap.remove(csID);
+ }
}
}
}
Modified: webservices/synapse/trunk/java/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/pom.xml?rev=604107&r1=604106&r2=604107&view=diff
==============================================================================
--- webservices/synapse/trunk/java/pom.xml (original)
+++ webservices/synapse/trunk/java/pom.xml Thu Dec 13 21:28:29 2007
@@ -844,6 +844,10 @@
</exclusion>
<exclusion>
<groupId>org.apache.axis2</groupId>
+ <artifactId>axis2</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb</artifactId>
</exclusion>
<exclusion>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
