You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by de...@apache.org on 2007/01/24 08:58:37 UTC
svn commit: r499301 - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2:
client/ServiceClient.java context/ConfigurationContext.java
Author: deepal
Date: Tue Jan 23 23:58:36 2007
New Revision: 499301
URL: http://svn.apache.org/viewvc?view=rev&rev=499301
Log:
fixing AXIS2-1053 and 2010
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java?view=diff&rev=499301&r1=499300&r2=499301
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java Tue Jan 23 23:58:36 2007
@@ -292,12 +292,14 @@
* @throws AxisFault if something goes wrong
*/
public void engageModule(QName moduleName) throws AxisFault {
- AxisModule module = axisConfig.getModule(moduleName);
- if (module != null) {
- axisService.engageModule(module, axisConfig);
- } else {
- throw new AxisFault("Unable to engage module : " +
- moduleName.getLocalPart());
+ synchronized (this) {
+ AxisModule module = axisConfig.getModule(moduleName);
+ if (module != null) {
+ axisService.engageModule(module, axisConfig);
+ } else {
+ throw new AxisFault("Unable to engage module : " +
+ moduleName.getLocalPart());
+ }
}
}
@@ -527,9 +529,9 @@
* for sync calls. However we leave real async calls alone.
*/
boolean useAsync = false;
- if(!options.isUseSeparateListener()) {
- Boolean useAsyncOption = (Boolean) configContext.getProperty(Constants.Configuration.USE_ASYNC_OPERATIONS);
- if(useAsyncOption != null) useAsync = useAsyncOption.booleanValue();
+ if (!options.isUseSeparateListener()) {
+ Boolean useAsyncOption = (Boolean) configContext.getProperty(Constants.Configuration.USE_ASYNC_OPERATIONS);
+ if (useAsyncOption != null) useAsync = useAsyncOption.booleanValue();
}
if (useAsync || options.isUseSeparateListener()) {
@@ -639,9 +641,9 @@
* for sync calls. However we leave real async calls alone.
*/
boolean useAsync = false;
- if(!options.isUseSeparateListener()) {
- Boolean useAsyncOption = (Boolean) configContext.getProperty(Constants.Configuration.USE_ASYNC_OPERATIONS);
- if(useAsyncOption != null) useAsync = useAsyncOption.booleanValue();
+ if (!options.isUseSeparateListener()) {
+ Boolean useAsyncOption = (Boolean) configContext.getProperty(Constants.Configuration.USE_ASYNC_OPERATIONS);
+ if (useAsyncOption != null) useAsync = useAsyncOption.booleanValue();
}
if (useAsync || options.isUseSeparateListener()) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java?view=diff&rev=499301&r1=499300&r2=499301
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java Tue Jan 23 23:58:36 2007
@@ -186,7 +186,8 @@
registerServiceGroupContext(serviceGroupContext);
} else if (Constants.SCOPE_TRANSPORT_SESSION.equals(maxScope)) {
if (sessionContext != null) {
- sessionContext.addServiceGroupContext(serviceGroupContext, serviceGroupContextId);
+ String serviceGroupName = serviceGroupContext.getDescription().getServiceGroupName();
+ sessionContext.addServiceGroupContext(serviceGroupContext, serviceGroupName);
sessionContext.addServiceContext(serviceContext);
}
}
@@ -353,8 +354,9 @@
if (serviceGroupContext == null
&& msgContext != null
&& msgContext.getSessionContext() != null) {
+ String serviceGroupName = msgContext.getAxisServiceGroup().getServiceGroupName();
serviceGroupContext = msgContext.getSessionContext().getServiceGroupContext(
- serviceGroupContextId);
+ serviceGroupName);
}
if (serviceGroupContext == null && msgContext != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org