Author: sumedha
Date: Fri Jan 18 21:08:10 2008
New Revision: 12497
Log:
improved fix for faulty service detection
Modified:
branches/wsas/java/2.2/commons/data-services/src/main/java/org/wso2/ws/dataservice/DBDeployer.java
branches/wsas/java/2.2/commons/data-services/src/main/java/org/wso2/ws/dataservice/FaultyServiceRectifier.java
Modified:
branches/wsas/java/2.2/commons/data-services/src/main/java/org/wso2/ws/dataservice/DBDeployer.java
==============================================================================
---
branches/wsas/java/2.2/commons/data-services/src/main/java/org/wso2/ws/dataservice/DBDeployer.java
(original)
+++
branches/wsas/java/2.2/commons/data-services/src/main/java/org/wso2/ws/dataservice/DBDeployer.java
Fri Jan 18 21:08:10 2008
@@ -21,6 +21,7 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -254,6 +255,11 @@
DBCPConnectionManager dbcpConnectionManager =
DBUtils.initializeDBConnectionManager(axisService.getName(),config);
if(dbcpConnectionManager != null){
+ try {
+
dbcpConnectionManager.getDatasource().getConnection();
+ } catch (SQLException e) {
+ throw new AxisFault("Pooling
manager could not establish a connection to database.");
+ }
axisService.addParameter(DBConstants.DB_CONNECTION,
dbcpConnectionManager.getDatasource());
}else {
throw new AxisFault("Pooling manager could not establish a
connection to database.");
Modified:
branches/wsas/java/2.2/commons/data-services/src/main/java/org/wso2/ws/dataservice/FaultyServiceRectifier.java
==============================================================================
---
branches/wsas/java/2.2/commons/data-services/src/main/java/org/wso2/ws/dataservice/FaultyServiceRectifier.java
(original)
+++
branches/wsas/java/2.2/commons/data-services/src/main/java/org/wso2/ws/dataservice/FaultyServiceRectifier.java
Fri Jan 18 21:08:10 2008
@@ -18,12 +18,10 @@
private static final Log log =
LogFactory.getLog(FaultyServiceRectifier.class);
private ConfigurationContext configurationCtx;
private Config config;
- private AxisService axisService;
private DeploymentFileData deploymentFileData;
public FaultyServiceRectifier(AxisService service,DeploymentFileData
deploymentData
,ConfigurationContext configCtx, Config
dataServiceConfigSection) {
- axisService = service;
deploymentFileData = deploymentData;
configurationCtx = configCtx;
config = dataServiceConfigSection;
@@ -44,6 +42,7 @@
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()
@@ -61,6 +60,9 @@
} catch (AxisFault e) {
log .error("Error occurred while trying to
re-establish database connection for "
+deploymentFileName+".Retrying....",e);
+ } catch (SQLException e) {
+ log .error("Error occurred while trying to
re-establish database connection for "
+ +deploymentFileName+".Retrying....",e);
}
}
_______________________________________________
Wsas-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
