Changeset 18696

Timestamp:

2009-03-16T19:01:41+13:00 (14 years ago)

Author:

ak19

Message:

Fixed bug on saving settings in GS2.

Location:

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

Files:

• BaseServerSettings.java (modified) (3 diffs)
• Server3Settings.java (modified) (1 diff)

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

@@ -71 +71 @@
         this.autoStart = false;
     }
-
-    this.servletDefault = server.build_properties.getProperty(BaseServer.Property.DEFAULT_SERVLET).replaceAll("/","");
 
     setSize(SIZE);
@@ -240 +238 @@
                 has_changed = true;
         }
-        if (!servletDefault.equals(servlet_combobox.getSelectedItem())) {
-            has_changed = true;
-                require_restart = true; 
+        if(servletDefault != null && servlet_combobox != null) {
+        if (!servletDefault.equals(servlet_combobox.getSelectedItem())) {
+            has_changed = true;
+            require_restart = true; 
+        }
         }
             //changed to use other browser
@@ -281 +281 @@
             browserPath = browserPath.replaceAll("\\\\","/");
         }
-                 newFileLines = scriptReadWrite.queryReplace(newFileLines,BaseServer.Property.BROWSER_PATH, browserPath);
+        newFileLines = scriptReadWrite.queryReplace(newFileLines,BaseServer.Property.BROWSER_PATH, browserPath);
 
         scriptReadWrite.writeOutFile(BaseServer.build_properties_file,

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

@@ -22 +22 @@
     {
     super(server);
+    this.servletDefault = server.build_properties.getProperty(BaseServer.Property.DEFAULT_SERVLET).replaceAll("/","");
     }