You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2005/12/26 15:50:28 UTC
svn commit: r359068 - in
/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2:
context/ConfigurationContext.java engine/InstanceDispatcher.java
Author: dims
Date: Mon Dec 26 06:50:24 2005
New Revision: 359068
URL: http://svn.apache.org/viewcvs?rev=359068&view=rev
Log:
Prevent NPE's *IF* a session context is not set (say JMS transport)
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java?rev=359068&r1=359067&r2=359068&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java Mon Dec 26 06:50:24 2005
@@ -133,8 +133,10 @@
messageContext.setServiceGroupContext(serviceGroupContext);
}
}
- // when you come here operation context MUST already been assigned to the message context
- serviceContext.setProperty(Constants.COOKIE_STRING, sessionContext.getCookieID());
+ if(sessionContext != null) {
+ // when you come here operation context MUST already been assigned to the message context
+ serviceContext.setProperty(Constants.COOKIE_STRING, sessionContext.getCookieID());
+ }
messageContext.getOperationContext().setParent(serviceContext);
}
@@ -202,7 +204,7 @@
serviceGroupContext.touch();
}
}
- if (serviceGroupContext == null) {
+ if (serviceGroupContext == null && msgContext.getSessionContext() != null) {
serviceGroupContext = msgContext.getSessionContext().getServiceGroupContext(
serviceGroupContextId);
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java?rev=359068&r1=359067&r2=359068&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java Mon Dec 26 06:50:24 2005
@@ -47,7 +47,7 @@
return;
}
//trying to get service context from Session context
- fillContextsFromSessionContetxt(msgContext);
+ fillContextsFromSessionContext(msgContext);
AxisOperation axisOperation = msgContext.getAxisOperation();
@@ -87,14 +87,14 @@
}
}
- private void fillContextsFromSessionContetxt(MessageContext msgContext) throws AxisFault {
+ private void fillContextsFromSessionContext(MessageContext msgContext) throws AxisFault {
AxisService service = msgContext.getAxisService();
if (service == null) {
throw new AxisFault("AxisService Not found yet");
}
SessionContext sessionContext = msgContext.getSessionContext();
String serviceGroupContextId = msgContext.getServiceGroupContextId();
- if (serviceGroupContextId != null) {
+ if (serviceGroupContextId != null && sessionContext != null) {
//setting service group context which is teken from session context
ServiceGroupContext serviceGroupContext = sessionContext.getServiceGroupContext(
serviceGroupContextId);