Changeset 26911 for main/trunk

Timestamp:

2013-02-21T14:01:29+13:00 (11 years ago)

Author:

davidb

Message:

Introduction of a shutdown method (which shuts down the complete server, not just a connection to a particular database). This function is used in the cleanUp sequence of calls, triggered when the servlet is stopped. Done to avoid 'warning thread still running [derby.antiGC] ... possible memory leak' message reported in catalina.out

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/DerbyWrapper.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/DerbyWrapper.java

@@ -87 +87 @@
     public void closeDatabase()
     {
-        state = null;
-        conn = null;
+            //state = null;
+        //conn = null;
         boolean gotSQLExc = false;
         try
-        {
-            DriverManager.getConnection(protocol_str + ";shutdown=true");
-        }
+            {
+            //  shutdown the database
+            DriverManager.getConnection(protocol_str + ";shutdown=true");
+            
+            }
         catch (SQLException se)
         {
-            gotSQLExc = true;
-        }
+            // this is good (i.e. what Derby is designed to do on a successful shutdown)
+            gotSQLExc = true;
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+
         if (!gotSQLExc)
         {
-            System.out.println("Database did not shut down normally");
-        }
-    }
+            System.err.println("Warning: Derby Database did not shut down normally");
+        }
+    }
+
+       public static void shutdownDatabaseServer()
+       {
+       boolean gotSQLExc = false;
+
+       try {
+           //  shutdown the whole server
+           DriverManager.getConnection(PROTOCOL + ";shutdown=true");
+           
+       }
+       catch (SQLException se) {
+           // this is good (i.e. what Derby is designed to do on a successful shutdown)
+           gotSQLExc = true;
+           //System.out.println("Shutdown returned: " + se);
+       }
+       catch (Exception e) {
+
+           e.printStackTrace();
+       }
+       if (!gotSQLExc) {
+           System.err.println("Warning: Derby did not shut down normally");
+       }
+
+       }
 
     public void createDatabase()