Changeset 30043 for main/trunk

Timestamp:

2015-07-20T17:51:14+12:00 (9 years ago)

Author:

ak19

Message:

Fixed a bug in shutting down the derbyserver. Noticed on Windows after previewing in GLI and then quitting GLI, the DOS prompt with the tomcat output displayed the message Warning: Derby did not shut down normally. Actually it had shut down but the code re-structure was wrong for when the message gets displayed.

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3

Files:

• sql/derby/DerbySQLServer.java (modified) (1 diff)
• util/DerbyWrapper.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/sql/derby/DerbySQLServer.java

@@ -55 +55 @@
 
     public boolean disconnect(String databasePath){
+
+    // Only shutdown if using embedded derby, 
+    // not if it's a networked derby server, which is what we now use
+
+    if(!DRIVER.equals("org.apache.derby.jdbc.EmbeddedDriver")) {
+        return true;
+    }
+
+    // embedded derby driver
     try{
-        // Only shutdown if using embedded derby, 
-        // not if it's a networked derby server, which is what we now use
-
-        if(DRIVER.equals("org.apache.derby.jdbc.EmbeddedDriver")) {
-        String protocol_str = PROTOCOL + databasePath + ";shutdown=true";       
-        DriverManager.getConnection(protocol_str);
-        }
+        String protocol_str = PROTOCOL + databasePath + ";shutdown=true";       
+        DriverManager.getConnection(protocol_str);
+        
     }catch (SQLException se){
         String theError = (se).getSQLState();

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

@@ -131 +131 @@
     public static void shutdownDatabaseServer()
     {
+
+        // shutdown the server if we're using an embedded derby
+        // if we're a derby client using the derby network server
+        
+        if(!DRIVER.equals("org.apache.derby.jdbc.EmbeddedDriver")) {
+            return;
+        }
+
         boolean gotSQLExc = false;
-
-        try
-        {
-            //  shutdown the whole server
-            // but not if we're a derby client using the derby network server 
-            // only if we're using an embedded derby
-            if(DRIVER.equals("org.apache.derby.jdbc.EmbeddedDriver")) {
-            DriverManager.getConnection(PROTOCOL + ";shutdown=true");
-            }
+        try
+        {
+            DriverManager.getConnection(PROTOCOL + ";shutdown=true");
         }
         catch (SQLException se)