[freenet-cvs] r9882 - trunk/freenet/src/freenet/node/updater

[t...@freenetproject.org]

Author: toad
Date: 2006-08-04 15:44:09 +0000 (Fri, 04 Aug 2006)
New Revision: 9882

Modified:
   trunk/freenet/src/freenet/node/updater/NodeUpdater.java
Log:
Try to fix NPE in updater

Modified: trunk/freenet/src/freenet/node/updater/NodeUpdater.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdater.java     2006-08-04 
15:15:33 UTC (rev 9881)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdater.java     2006-08-04 
15:44:09 UTC (rev 9882)
@@ -212,11 +212,21 @@

                        boolean nastyRestart = false;

-                       if((File.separatorChar == '\\') || 
(System.getProperty("os.name").toLowerCase().startsWith("win"))){
+                       if((File.separatorChar == '\\') || 
(System.getProperty("os.name").toLowerCase().startsWith("win"))) {
                                nastyRestart = true;
+                               
+                               
if(!WrapperManager.isControlledByNativeWrapper()) {
+                                       Logger.error(this, "Cannot update 
because not running under wrapper");
+                                       System.err.println("Cannot update 
because not running under wrapper");
+                                       return;
+                               }
+                               
                                Properties p = WrapperManager.getProperties();
                                String cp1 = 
p.getProperty("wrapper.java.classpath.1");
-                               if(cp1.equals("freenet-cvs-snapshot.jar")) {
+                               if(cp1 == null) {
+                                       Logger.error(this, 
"wrapper.java.classpath.1 = null - maybe wrapper.conf is broken?");
+                                       
System.err.println("wrapper.java.classpath.1 = null - maybe wrapper.conf is 
broken?");
+                               } else 
if(cp1.equals("freenet-cvs-snapshot.jar")) {
                                        // Cool!
                                } else 
if(cp1.equals("freenet-cvs-snapshot.jar.new")) {
                                        // Swapped; we are running .new
@@ -225,9 +235,9 @@
                                        fNew = tmp;
                                } else {
                                        cp1 = 
p.getProperty("wrapper.java.classpath.2");
-                                       
if(cp1.equals("freenet-cvs-snapshot.jar")) {
+                                       if(cp1 != null && 
cp1.equals("freenet-cvs-snapshot.jar")) {
                                                // Cool!
-                                       } else 
if(cp1.equals("freenet-cvs-snapshot.jar.new")) {
+                                       } else if(cp1 != null && 
cp1.equals("freenet-cvs-snapshot.jar.new")) {
                                                // Swapped; we are running .new
                                                File tmp = fRunning;
                                                fRunning = fNew;