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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2006-08-07 20:15:36 +0000 (Mon, 07 Aug 2006)
New Revision: 9954

Modified:
   trunk/freenet/src/freenet/node/updater/NodeUpdater.java
Log:
fix the updater to be compatible with the new wrapper.conf

Modified: trunk/freenet/src/freenet/node/updater/NodeUpdater.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdater.java     2006-08-07 
20:13:35 UTC (rev 9953)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdater.java     2006-08-07 
20:15:36 UTC (rev 9954)
@@ -234,8 +234,8 @@
                        ArrayBucket bucket = (ArrayBucket) result.asBucket();
                        byte[] data = bucket.toByteArray();

-                       File fRunning = new File("freenet-stable-latest.jar");
-                       File fNew = new File("freenet-stable-latest.jar.new");
+                       File fRunning = new File("freenet.jar");
+                       File fNew = new File("freenet.jar.new");

                        boolean nastyRestart = false;

@@ -247,18 +247,18 @@
                                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-stable-latest.jar")) {
+                               } else if(cp1.equals("freenet.jar")) {
                                        // Cool!
-                               } else 
if(cp1.equals("freenet-stable-latest.jar.new")) {
+                               } else if(cp1.equals("freenet.jar.new")) {
                                        // Swapped; we are running .new
                                        File tmp = fRunning;
                                        fRunning = fNew;
                                        fNew = tmp;
                                } else {
                                        cp1 = 
p.getProperty("wrapper.java.classpath.2");
-                                       if(cp1 != null && 
cp1.equals("freenet-stable-latest.jar")) {
+                                       if(cp1 != null && 
cp1.equals("freenet.jar")) {
                                                // Cool!
-                                       } else if(cp1 != null && 
cp1.equals("freenet-stable-latest.jar.new")) {
+                                       } else if(cp1 != null && 
cp1.equals("freenet.jar.new")) {
                                                // Swapped; we are running .new
                                                File tmp = fRunning;
                                                fRunning = fNew;