axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r646492 - in /webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws: context/factory/MessageContextFactory.java context/utils/ContextUtils.java server/endpoint/lifecycle/impl/EndpointLifecycleManagerImpl.java
Date Wed, 09 Apr 2008 19:28:24 GMT
Author: gawor
Date: Wed Apr  9 12:28:21 2008
New Revision: 646492

URL: http://svn.apache.org/viewvc?rev=646492&view=rev
Log:
ensure MessageContext.REFERENCE_PARAMETERS property (and others) is visible in handlers (AXIS2-3720)

Modified:
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/context/factory/MessageContextFactory.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/context/utils/ContextUtils.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/endpoint/lifecycle/impl/EndpointLifecycleManagerImpl.java

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/context/factory/MessageContextFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/context/factory/MessageContextFactory.java?rev=646492&r1=646491&r2=646492&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/context/factory/MessageContextFactory.java
(original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/context/factory/MessageContextFactory.java
Wed Apr  9 12:28:21 2008
@@ -20,6 +20,7 @@
 package org.apache.axis2.jaxws.context.factory;
 
 import org.apache.axis2.jaxws.context.WebServiceContextImpl;
+import org.apache.axis2.jaxws.context.utils.ContextUtils;
 import org.apache.axis2.jaxws.core.MessageContext;
 import org.apache.axis2.jaxws.handler.LogicalMessageContext;
 import org.apache.axis2.jaxws.handler.SoapMessageContext;
@@ -45,7 +46,9 @@
      */
     public static SoapMessageContext createSoapMessageContext(
             org.apache.axis2.jaxws.core.MessageContext jaxwsMessageContext) {
-        return new SoapMessageContext(jaxwsMessageContext);
+        SoapMessageContext soapCtx = new SoapMessageContext(jaxwsMessageContext);
+        ContextUtils.addProperties(soapCtx, jaxwsMessageContext);
+        return soapCtx;
     }
     
     /**

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/context/utils/ContextUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/context/utils/ContextUtils.java?rev=646492&r1=646491&r2=646492&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/context/utils/ContextUtils.java
(original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/context/utils/ContextUtils.java
Wed Apr  9 12:28:21 2008
@@ -97,7 +97,11 @@
         //Lazily provide a list of available reference parameters.
         org.apache.axis2.context.MessageContext msgContext =
             jaxwsMessageContext.getAxisMessageContext();
-        SOAPHeader header = msgContext.getEnvelope().getHeader();
+        SOAPHeader header = null;
+        if (msgContext != null &&
+            msgContext.getEnvelope() != null) {
+            header = msgContext.getEnvelope().getHeader();
+        }
         List<Element> list = new ReferenceParameterList(header);
         
         soapMessageContext

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/endpoint/lifecycle/impl/EndpointLifecycleManagerImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/endpoint/lifecycle/impl/EndpointLifecycleManagerImpl.java?rev=646492&r1=646491&r2=646492&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/endpoint/lifecycle/impl/EndpointLifecycleManagerImpl.java
(original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/endpoint/lifecycle/impl/EndpointLifecycleManagerImpl.java
Wed Apr  9 12:28:21 2008
@@ -26,7 +26,6 @@
 import org.apache.axis2.jaxws.ExceptionFactory;
 import org.apache.axis2.jaxws.context.WebServiceContextImpl;
 import org.apache.axis2.jaxws.context.factory.MessageContextFactory;
-import org.apache.axis2.jaxws.context.utils.ContextUtils;
 import org.apache.axis2.jaxws.core.MessageContext;
 import org.apache.axis2.jaxws.description.ServiceDescription;
 import org.apache.axis2.jaxws.handler.SoapMessageContext;
@@ -253,7 +252,6 @@
     protected javax.xml.ws.handler.MessageContext createSOAPMessageContext(MessageContext
mc) {
         SoapMessageContext soapMessageContext =
                 (SoapMessageContext) MessageContextFactory.createSoapMessageContext(mc);
-        ContextUtils.addProperties(soapMessageContext, mc);
         return soapMessageContext;
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message