You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2011/09/19 18:03:08 UTC
svn commit: r1172677 - in /incubator/airavata/trunk/modules/ws-messenger:
commons/src/main/java/org/apache/airavata/wsmg/commons/storage/JdbcStorage.java
messagebroker/src/main/java/org/apache/airavata/wsmg/commons/storage/WsmgPersistantStorage.java
Author: lahiru
Date: Mon Sep 19 16:03:08 2011
New Revision: 1172677
URL: http://svn.apache.org/viewvc?rev=1172677&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AIRAVATA-112.
Modified:
incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/JdbcStorage.java
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/storage/WsmgPersistantStorage.java
Modified: incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/JdbcStorage.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/JdbcStorage.java?rev=1172677&r1=1172676&r2=1172677&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/JdbcStorage.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/JdbcStorage.java Mon Sep 19 16:03:08 2011
@@ -118,17 +118,21 @@ public class JdbcStorage {
conn = connectionPool.getConnection();
stmt = conn.prepareStatement(query);
rs = stmt.executeQuery();
+ conn.setAutoCommit(false);
} finally {
if (conn != null) {
connectionPool.free(conn);
}
- if (stmt != null && !stmt.isClosed()) {
- stmt.close();
- }
}
return rs;
}
+ public void close() throws SQLException {
+ if (stmt != null && !stmt.isClosed()) {
+ stmt.close();
+ }
+ }
+
public int countRow(String tableName, String columnName) throws SQLException {
String query = new String("SELECT COUNT(" + columnName + ") FROM " + tableName);
int count = -1;
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/storage/WsmgPersistantStorage.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/storage/WsmgPersistantStorage.java?rev=1172677&r1=1172676&r2=1172677&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/storage/WsmgPersistantStorage.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/storage/WsmgPersistantStorage.java Mon Sep 19 16:03:08 2011
@@ -88,7 +88,6 @@ public class WsmgPersistantStorage imple
logger.info("Database already created for Message Broker!");
}
db.closeConnection(conn);
-
// inject dbname to sql statement.
SubscriptionConstants.ORDINARY_SUBSCRIPTION_INSERT_QUERY = String.format(
SubscriptionConstants.INSERT_SQL_QUERY, ordinarySubsTblName);
@@ -142,6 +141,7 @@ public class WsmgPersistantStorage imple
} finally {
if (rs != null) {
try {
+ db.close();
rs.close();
} catch (SQLException ex) {
logger.error("sql exception occured", ex);