Changeset 19005 for greenstone3

Timestamp:

2009-04-16T13:23:06+12:00 (15 years ago)

Author:

ak19

Message:

Made changes so that when the BaseServerControl (the GS server app) is closed, it not only exits the app, but always stops the server. Previously it used to sometimes stop the server and sometimes not.

File:

• greenstone3/trunk/src/java/org/greenstone/server/BaseServerControl.java (modified) (2 diffs)

greenstone3/trunk/src/java/org/greenstone/server/BaseServerControl.java

@@ -105 +105 @@
     iExit.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent ae) {
-            Thread runInThread = new Thread(new Runnable(){
-                public void run(){
-                server.stop();
-                
-                }
-            },"stop server");
-            try{
-                        runInThread.start(); 
-        
-            }
+            /*Thread runInThread = new Thread(new Runnable(){
+              public void run(){
+              server.stop();
+              
+              }
+              },"stop server");
+              try{
+              runInThread.start(); 
+              
+              }
             catch(Exception e){
-            logger.error(e);
-            }    
+            logger.error(e);
+            }*/    
             thisframe.dispose();
+            server.stop();
+            System.exit(0);
         }
         });
@@ -179 +181 @@
     private class MyAdapter extends WindowAdapter{   
     public void windowClosing(WindowEvent env){
-            Thread runInThread = new Thread(new Runnable(){
-                public void run(){
-                server.stop();
-                
-                }
-        },"stop server");
-        try{
-        runInThread.start(); 
-        }
-        catch(Exception e){
-        logger.error(e);
-        }  
+        /*          Thread runInThread = new Thread(new Runnable(){
+            public void run(){
+            server.stop();
+            
+            }
+            },"stop server");
+            try{
+            runInThread.start(); 
+            }
+            catch(Exception e){
+            logger.error(e);
+            }  
+            thisframe.dispose();
+        */
         thisframe.dispose();
+        server.stop();
+        System.exit(0);
     }
     }