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 2012/10/22 20:32:51 UTC
svn commit: r1400988 - in /airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool: DatabaseStorageImpl.java MessageBoxDB.java

Author: lahiru
Date: Mon Oct 22 18:32:51 2012
New Revision: 1400988

URL: http://svn.apache.org/viewvc?rev=1400988&view=rev
Log:
fixing errors during shutdown.

Modified:
    airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/DatabaseStorageImpl.java
    airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/MessageBoxDB.java

Modified: airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/DatabaseStorageImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/DatabaseStorageImpl.java?rev=1400988&r1=1400987&r2=1400988&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/DatabaseStorageImpl.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/DatabaseStorageImpl.java Mon Oct 22 18:32:51 2012
@@ -24,6 +24,7 @@ package org.apache.airavata.wsmg.msgbox.
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.sql.SQLNonTransientConnectionException;
 import java.util.List;
 import java.util.UUID;
 
@@ -95,6 +96,8 @@ public class DatabaseStorageImpl impleme
         try {
             list = MessageBoxDB.getInstance().removeAllMessagesforClient(key);
 
+        }catch(SQLNonTransientConnectionException e){
+            logger.info("Database connection is interrupted");
         } catch (SQLException e) {
             throw new Exception("Error reading the message with the key " + key, e);
         } catch (IOException e) {

Modified: airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/MessageBoxDB.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/MessageBoxDB.java?rev=1400988&r1=1400987&r2=1400988&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/MessageBoxDB.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/MessageBoxDB.java Mon Oct 22 18:32:51 2012
@@ -27,10 +27,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
+import java.sql.*;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -214,6 +211,8 @@ public class MessageBoxDB {
 
                 // commit
                 db.commit(connection);
+            } catch(SQLNonTransientConnectionException e){
+                logger.info("Database connection is interrupted");
             } catch (SQLException sql) {
                 db.rollback(connection);
                 throw sql;