Wrong fix. We explicitly rewrite the wrapper.conf when doing an update
in Windows around L326 (on Windows). We can do the same thing on *nix.
On Tue, Aug 08, 2006 at 02:42:23PM +0000, nextgens at freenetproject.org wrote:
> 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?");
>
> _______________________________________________
> cvs mailing list
> cvs at freenetproject.org
> http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
>
--
Matthew J Toseland - toad at amphibian.dyndns.org
Freenet Project Official Codemonkey - http://freenetproject.org/
ICTHUS - Nothing is impossible. Our Boss says so.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL:
<https://emu.freenetproject.org/pipermail/cvs/attachments/20060808/b14361b3/attachment.pgp>
