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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2006-08-08 14:42:19 +0000 (Tue, 08 Aug 2006)
New Revision: 9967

Modified:
   trunk/freenet/src/freenet/node/updater/NodeUpdater.java
Log:
maybe fix wrapper.conf if it needs to... I'm not sure that the hashmap is 
written back to the file afterwards

Modified: trunk/freenet/src/freenet/node/updater/NodeUpdater.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdater.java     2006-08-08 
14:39:02 UTC (rev 9966)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdater.java     2006-08-08 
14:42:19 UTC (rev 9967)
@@ -239,11 +239,20 @@

                        boolean nastyRestart = false;

+                       /*
+                        * MyUglyHack ... FIXME: REMOVE:!
+                        */
+                       Properties p = WrapperManager.getProperties();
+                       String cp1 = p.getProperty("wrapper.java.classpath.1");
+                       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")||cp1.equals("freenet-latest-stable.jar"))
+                               p.setProperty("wrapper.java.classpath.1", 
"freenet.jar");
+                       
                        if((File.separatorChar == '\\') || 
(System.getProperty("os.name").toLowerCase().startsWith("win"))) {
                                nastyRestart = true;

-                               Properties p = WrapperManager.getProperties();
-                               String cp1 = 
p.getProperty("wrapper.java.classpath.1");
                                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?");