svn commit: r1066379 - in /synapse/trunk/java/modules: core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerWorker.java

[supun]

Author: supun
Date: Wed Feb  2 09:12:55 2011
New Revision: 1066379

URL: http://svn.apache.org/viewvc?rev=1066379&view=rev
Log:
fixing and small case where calculation of the REST_URL_POSTFIX doesn't take in 
to account the / in a request

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
    
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerWorker.java

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=1066379&r1=1066378&r2=1066379&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  2 09:12:55 2011
@@ -200,7 +200,7 @@ public class SynapseCallbackReceiver imp
                     synapseOutMsgCtx.getEnvelope().build();
                 } catch (OMException x) {
                     synapseOutMsgCtx.setEnvelope(response.getEnvelope());
-                  }
+                }
 
                 Exception e = (Exception) 
response.getProperty(SynapseConstants.ERROR_EXCEPTION);
 
@@ -227,7 +227,7 @@ public class SynapseCallbackReceiver imp
             // there can always be only one instance of an Endpoint in the 
faultStack of a message
             // if the send was successful, so remove it before we proceed any 
further
             Stack faultStack = synapseOutMsgCtx.getFaultStack();
-            if (faultStack !=null && !faultStack.isEmpty()
+            if (faultStack != null && !faultStack.isEmpty()
                 && faultStack.peek() instanceof Endpoint) {
                 Endpoint successfulEndpoint = (Endpoint) faultStack.pop();
                 successfulEndpoint.onSuccess();

Modified: 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerWorker.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerWorker.java?rev=1066379&r1=1066378&r2=1066379&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerWorker.java
 (original)
+++ 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerWorker.java
 Wed Feb  2 09:12:55 2011
@@ -239,10 +239,10 @@ public class ServerWorker implements Run
             int pos = uri.indexOf("://");
             if (pos != -1) {
                 uri = uri.substring(pos + 3);
-                pos = uri.indexOf("/");
-                if (pos != -1) {
-                    uri = uri.substring(pos + 1);
-                }
+            }
+            pos = uri.indexOf("/");
+            if (pos != -1) {
+                uri = uri.substring(pos + 1);
             }
         }
         msgContext.setProperty(NhttpConstants.REST_URL_POSTFIX, uri);