svn commit: r710032 - /webservices/commons/trunk/modules/transport/modules/xmpp/src/org/apache/axis2/transport/xmpp/XMPPSender.java

[sumedha]

Author: sumedha
Date: Mon Nov  3 02:06:10 2008
New Revision: 710032

URL: http://svn.apache.org/viewvc?rev=710032&view=rev
Log:
moved xmpp connection retrival part out of if block,commented out REST check

Modified:
    
webservices/commons/trunk/modules/transport/modules/xmpp/src/org/apache/axis2/transport/xmpp/XMPPSender.java

Modified: 
webservices/commons/trunk/modules/transport/modules/xmpp/src/org/apache/axis2/transport/xmpp/XMPPSender.java
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/xmpp/src/org/apache/axis2/transport/xmpp/XMPPSender.java?rev=710032&r1=710031&r2=710032&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/transport/modules/xmpp/src/org/apache/axis2/transport/xmpp/XMPPSender.java
 (original)
+++ 
webservices/commons/trunk/modules/transport/modules/xmpp/src/org/apache/axis2/transport/xmpp/XMPPSender.java
 Mon Nov  3 02:06:10 2008
@@ -145,13 +145,12 @@
                        msgCtx.getProperty(Constants.OUT_TRANSPORT_INFO);
                }
        
-       
+               xmppConnection = 
xmppOutTransportInfo.getConnectionFactory().getXmppConnection();    
+               
                if(msgCtx.isServerSide()){
-                       xmppConnection = 
xmppOutTransportInfo.getConnectionFactory().getXmppConnection();
                        message.setProperty(XMPPConstants.IS_SERVER_SIDE, new 
Boolean(false));
                        message.setProperty(XMPPConstants.IN_REPLY_TO, 
xmppOutTransportInfo.getInReplyTo());
-               }else{
-                       xmppConnection = 
xmppOutTransportInfo.getConnectionFactory().getXmppConnection();
+               }else{                  
                        message.setProperty(XMPPConstants.IS_SERVER_SIDE,new 
Boolean(true));
                        message.setProperty(XMPPConstants.SERVICE_NAME, 
serviceName);
                        String action = options.getAction();
@@ -176,9 +175,9 @@
                try 
                {
                        OMElement msgElement = msgCtx.getEnvelope();
-                       if (msgCtx.isDoingREST()) {
-                               msgElement = 
msgCtx.getEnvelope().getBody().getFirstElement();
-                       }
+                       //if (msgCtx.isDoingREST()) {
+                       //      msgElement = 
msgCtx.getEnvelope().getBody().getFirstElement();
+                       //}
                        boolean waitForResponse =
                                msgCtx.getOperationContext() != null &&
                                WSDL2Constants.MEP_URI_OUT_IN.equals(
@@ -203,6 +202,7 @@
                        //If this is on client side, wait for the response from 
server.
                        //Is this the best way to do this?
                        if(waitForResponse && !msgCtx.isServerSide()){
+                               //TODO : need to add a timeout
                                while(! 
xmppClientSidePacketListener.isResponseReceived()){
                                        try {
                                                Thread.sleep(1000);