[Ds-java-dev] svn commit r17602 - trunk/solutions/data-services/java/modules/core/src/main/java/org/wso2/ws/dataservice

[sumedha at wso2.com]

Author: sumedha
Date: Thu May 29 07:10:14 2008
New Revision: 17602
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=17602

Log:
cancelling scheduled tasks for faulty services when the configuration file is removed

Modified:
   trunk/solutions/data-services/java/modules/core/src/main/java/org/wso2/ws/dataservice/FaultyServiceRectifier.java

Modified: trunk/solutions/data-services/java/modules/core/src/main/java/org/wso2/ws/dataservice/FaultyServiceRectifier.java
URL: http://wso2.org/svn/browse/wso2/trunk/solutions/data-services/java/modules/core/src/main/java/org/wso2/ws/dataservice/FaultyServiceRectifier.java?rev=17602&r1=17601&r2=17602&view=diff
==============================================================================
--- trunk/solutions/data-services/java/modules/core/src/main/java/org/wso2/ws/dataservice/FaultyServiceRectifier.java	(original)
+++ trunk/solutions/data-services/java/modules/core/src/main/java/org/wso2/ws/dataservice/FaultyServiceRectifier.java	Thu May 29 07:10:14 2008
@@ -1,5 +1,6 @@
 package org.wso2.ws.dataservice;
 
+import java.io.File;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.TimerTask;
@@ -36,26 +37,34 @@
 		String deploymentFileName = "";
 		try {
 			deploymentFileName = deploymentFileData.getFile().getAbsolutePath();
-			log.info("Trying to re-establish fautly database connection " +
-					"for data services :"+deploymentFileName);
-			DBCPConnectionManager dbcpConnectionManager = 
-				DBUtils.initializeDBConnectionManager(deploymentFileName, config);
-			dataSource = dbcpConnectionManager.getDatasource();
-			if (dataSource != null) {
-				Connection connection = dataSource.getConnection();
-				log.info("Database connection successful. Removing "
-						+ deploymentFileName + " from Fault Service list.");
-				configurationCtx.getAxisConfiguration().getFaultyServices()
-						.remove(deploymentFileName);
-				//cancel the timer task
+			File file = new File(deploymentFileName);
+			if(file.isFile()){
+				log.info("Trying to re-establish fautly database connection " +
+						"for data services :"+deploymentFileName);
+				DBCPConnectionManager dbcpConnectionManager = 
+					DBUtils.initializeDBConnectionManager(deploymentFileName, config);
+				dataSource = dbcpConnectionManager.getDatasource();
+				if (dataSource != null) {
+					Connection connection = dataSource.getConnection();
+					log.info("Database connection successful. Removing "
+							+ deploymentFileName + " from Fault Service list.");
+					configurationCtx.getAxisConfiguration().getFaultyServices()
+							.remove(deploymentFileName);
+					//cancel the timer task
+					this.cancel();
+					//send the dataservice configuration through re-deployement
+					DBDeployer dbDeployer = new DBDeployer();
+					dbDeployer.init(configurationCtx);
+					dbDeployer.deploy(deploymentFileData);
+				} else {
+					log.error("Database connection re-establishment for "
+							+ deploymentFileName + " failed.Retrying...");
+				}				
+			}else{
+				log.info("Deployment file "+deploymentFileName
+						+" does not exist.Removing timer task");
+				/* Cancel the timer Task */
 				this.cancel();
-				//send the dataservice configuration through re-deployement
-				DBDeployer dbDeployer = new DBDeployer();
-				dbDeployer.init(configurationCtx);
-				dbDeployer.deploy(deploymentFileData);
-			} else {
-				log.error("Database connection re-establishment for "
-						+ deploymentFileName + " failed.Retrying...");
 			}
 		} catch (AxisFault e) {
 			log	.error("Error occurred while trying to re-establish database connection for "