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 am...@apache.org on 2008/07/25 06:22:46 UTC
svn commit: r679658 - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2:
client/Stub.java engine/AxisConfiguration.java
Author: amilas
Date: Thu Jul 24 21:22:45 2008
New Revision: 679658
URL: http://svn.apache.org/viewvc?rev=679658&view=rev
Log:
stop going notifications at the client side to remove service groups. stub has removed the services at its finalize
method. if this method calls first it gives a problem to former fix. Anyway all the services under group is removed in the service
client finalize method.
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Stub.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Stub.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Stub.java?rev=679658&r1=679657&r2=679658&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Stub.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Stub.java Thu Jul 24 21:22:45 2008
@@ -130,7 +130,7 @@
* @throws AxisFault
*/
public void cleanup() throws AxisFault {
- _service.getAxisConfiguration().removeService(_service.getName());
+ // service is removed from the service client it self.
}
/**
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?rev=679658&r1=679657&r2=679658&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java Thu Jul 24 21:22:45 2008
@@ -400,11 +400,14 @@
serviceGroupName));
}
Iterator services = axisServiceGroup.getServices();
+ boolean isClientSide = false;
while (services.hasNext()) {
AxisService axisService = (AxisService) services.next();
allServices.remove(axisService.getName());
if (!axisService.isClientSide()) {
notifyObservers(AxisEvent.SERVICE_REMOVE, axisService);
+ } else {
+ isClientSide = true;
}
//removes the endpoints to this service
@@ -423,7 +426,10 @@
}
removeChild(serviceGroupName);
- notifyObservers(AxisEvent.SERVICE_REMOVE, axisServiceGroup);
+ if (!isClientSide) {
+ notifyObservers(AxisEvent.SERVICE_REMOVE, axisServiceGroup);
+ }
+
return axisServiceGroup;
}