[Mashup-dev] svn commit r20309 - branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/request

[keith at wso2.com]

Author: keith
Date: Sat Aug  2 23:59:09 2008
New Revision: 20309
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=20309

Log:
Fixing Mashup-1046. Adding a Null check. Ideally the JMS Listener should have set the to address in the MessageContext though.



Modified:
   branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/request/Request.java

Modified: branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/request/Request.java
URL: http://wso2.org/svn/browse/wso2/branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/request/Request.java?rev=20309&r1=20308&r2=20309&view=diff
==============================================================================
--- branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/request/Request.java	(original)
+++ branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/request/Request.java	Sat Aug  2 23:59:09 2008
@@ -22,6 +22,7 @@
 import org.wso2.wsas.persistence.PersistenceManager;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.AxisService;
+import org.apache.axis2.addressing.EndpointReference;
 import org.apache.ws.security.handler.WSHandlerConstants;
 import org.apache.ws.security.handler.WSHandlerResult;
 import org.apache.ws.security.WSSecurityEngineResult;
@@ -139,6 +140,11 @@
      */
     public String jsGet_address() throws MashupFault {
         MessageContext messageContext = MessageContext.getCurrentMessageContext();
-        return messageContext.getTo().getAddress();
+        EndpointReference to = messageContext.getTo();
+        String address = null;
+        if (to != null) {
+           address = to.getAddress();
+        }
+        return address;
     }
 }