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 am...@apache.org on 2009/03/31 06:33:55 UTC
svn commit: r760317 - in /webservices/axis2/trunk/java/modules/kernel:
src/org/apache/axis2/deployment/ src/org/apache/axis2/description/
src/org/apache/axis2/engine/ test/org/apache/axis2/deployment/
Author: amilas
Date: Tue Mar 31 04:33:54 2009
New Revision: 760317
URL: http://svn.apache.org/viewvc?rev=760317&view=rev
Log:
commit the patch for AXIS2-4289
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/FaultyServicesDueToModuleTest.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=760317&r1=760316&r2=760317&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java Tue Mar 31 04:33:54 2009
@@ -557,10 +557,11 @@
axisConfiguration.addModule(modulemetadata);
log.debug(Messages.getMessage(DeploymentErrorMsgs.ADDING_NEW_MODULE));
- synchronized (axisConfiguration.getFaultyServicsDuetoModules()) {
+ synchronized (axisConfiguration.getFaultyServicesDuetoModules()) {
//Check whether there are faulty services due to this module
- HashMap<String, FaultyServiceData> faultyServices = axisConfiguration.getFaultyServicesDuetoModule(
+ HashMap<String, FaultyServiceData> faultyServices =
+ (HashMap<String, FaultyServiceData>)axisConfiguration.getFaultyServicesDuetoModule(
modulemetadata.getName());
faultyServices = (HashMap<String, FaultyServiceData>)faultyServices.clone();
@@ -624,7 +625,7 @@
URL serviceLocation,
DeploymentFileData currentDeploymentFile,
AxisConfiguration axisConfig) throws AxisFault {
- synchronized (axisConfig.getFaultyServicsDuetoModules()) {
+ synchronized (axisConfig.getFaultyServicesDuetoModules()) {
String moduleName;
ArrayList groupModules = serviceGroup.getModuleRefs();
for (int i = 0; i < groupModules.size(); i++) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java?rev=760317&r1=760316&r2=760317&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java Tue Mar 31 04:33:54 2009
@@ -310,7 +310,8 @@
mc.setProperty(MessageContext.TRANSPORT_NON_BLOCKING, Boolean.TRUE);
mc.getConfigurationContext().registerOperationContext(mc.getMessageID(), oc);
AxisEngine.send(mc);
- if (internalCallback != null) {
+ System.out.println("--- Going to wait for call back message comes. --- "+ Thread.currentThread().getId());
+ if (internalCallback != null) {
internalCallback.waitForCompletion(options.getTimeOutInMilliSeconds());
// process the result of the invocation
@@ -538,7 +539,8 @@
* finally block.
*/
public synchronized void onComplete() {
- complete = true;
+ System.out.println("-- Got the response notify the call back -- " + Thread.currentThread().getId());
+ complete = true;
notify();
}
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=760317&r1=760316&r2=760317&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 Tue Mar 31 04:33:54 2009
@@ -117,8 +117,12 @@
*/
private Hashtable<String, String> faultyServices;
- private final HashMap<String, HashMap<String, FaultyServiceData>> faultyServicesDueToModules = new HashMap<String,
- HashMap<String, FaultyServiceData>>();
+ /**
+ * To store services which have become faulty due to modules. Here key is the module name and the corresponding
+ * value is an another map which holds the list faulty services due a single module.
+ */
+ private final Map<String, Map<String, FaultyServiceData>> faultyServicesDueToModules = new HashMap<String,
+ Map<String, FaultyServiceData>>();
private List<Phase> inFaultPhases;
@@ -653,7 +657,7 @@
* @param faultyServiceData Data that are required when recovering the faulty service.
*/
public void addFaultyServiceDuetoModule(String moduleName, FaultyServiceData faultyServiceData) {
- HashMap<String, FaultyServiceData> faultyServicesMap;
+ Map<String, FaultyServiceData> faultyServicesMap;
synchronized (faultyServicesDueToModules) {
@@ -669,7 +673,12 @@
}
}
- public HashMap<String, FaultyServiceData> getFaultyServicesDuetoModule(String moduleName) {
+ /**
+ * Returns a map which contains the faulty services due a module.
+ * @param moduleName
+ * @return
+ */
+ public Map<String, FaultyServiceData> getFaultyServicesDuetoModule(String moduleName) {
if (faultyServicesDueToModules.containsKey(moduleName)) {
return faultyServicesDueToModules.get(moduleName);
@@ -677,13 +686,22 @@
return new HashMap<String, FaultyServiceData>(1);
}
- public HashMap<String, HashMap<String, FaultyServiceData>> getFaultyServicsDuetoModules(){
+ /**
+ * Returns the map which keeps track of faulty services due to modules.
+ * @return
+ */
+ public Map<String, Map<String, FaultyServiceData>> getFaultyServicesDuetoModules(){
return faultyServicesDueToModules;
}
+ /**
+ * Removes a faulty service from the map faultyServicesDueToModules.
+ * @param moduleName
+ * @param serviceGroupName
+ */
public void removeFaultyServiceDuetoModule(String moduleName, String serviceGroupName) {
synchronized (faultyServicesDueToModules) {
- HashMap<String, FaultyServiceData> faultyServices = faultyServicesDueToModules.get(moduleName);
+ Map<String, FaultyServiceData> faultyServices = faultyServicesDueToModules.get(moduleName);
if(faultyServices != null){
faultyServices.remove(serviceGroupName);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/FaultyServicesDueToModuleTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/FaultyServicesDueToModuleTest.java?rev=760317&r1=760316&r2=760317&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/FaultyServicesDueToModuleTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/FaultyServicesDueToModuleTest.java Tue Mar 31 04:33:54 2009
@@ -29,6 +29,7 @@
import org.apache.axis2.context.ConfigurationContextFactory;
import java.util.HashMap;
+import java.util.Map;
import java.io.File;
public class FaultyServicesDueToModuleTest extends TestCase {
@@ -45,7 +46,7 @@
AxisService axisService = axisConfig.getService("echo2");
assertNull(axisService);
- HashMap<String, FaultyServiceData> faultyServicesMap = axisConfig.getFaultyServicesDuetoModule(
+ Map<String, FaultyServiceData> faultyServicesMap = axisConfig.getFaultyServicesDuetoModule(
"sample-logging");
FaultyServiceData faultyServiceData = faultyServicesMap.get("echo2");
assertNotNull(faultyServiceData);
@@ -60,7 +61,7 @@
AxisService axisService = axisConfig.getService("echo2");
assertNotNull(axisService);
- HashMap<String, FaultyServiceData> faultyServicesMap = axisConfig.getFaultyServicesDuetoModule(
+ Map<String, FaultyServiceData> faultyServicesMap = axisConfig.getFaultyServicesDuetoModule(
"sample-logging");
FaultyServiceData faultyServiceData = faultyServicesMap.get("echo2");
assertNull(faultyServiceData);