[freenet-cvs] r8925 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2006-05-29 17:06:40 +0000 (Mon, 29 May 2006)
New Revision: 8925

Modified:
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/Version.java
Log:
749: If getenv throws, ask WrapperManager whether the workaround has been set.

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-05-29 16:52:50 UTC (rev 
8924)
+++ trunk/freenet/src/freenet/node/Node.java    2006-05-29 17:06:40 UTC (rev 
8925)
@@ -27,6 +27,8 @@
 import java.util.Iterator;
 import java.util.zip.DeflaterOutputStream;

+import org.tanukisoftware.wrapper.WrapperManager;
+
 import freenet.client.ArchiveManager;
 import freenet.client.ClientMetadata;
 import freenet.client.FetchException;
@@ -1446,7 +1448,13 @@
                                                osVersion.startsWith("2.7") || 
osVersion.startsWith("3."))) {
                        // Hopefully we won't still have to deal with this **** 
when THAT comes out! 
                        // Check the environment.
-                       String assumeKernel = System.getenv("LD_ASSUME_KERNEL");
+                       String assumeKernel;
+                       try {
+                               assumeKernel = 
System.getenv("LD_ASSUME_KERNEL");
+                       } catch (Error e) {
+                               assumeKernel = null;
+                               assumeKernel = 
WrapperManager.getProperties().getProperty("set.LD_ASSUME_KERNEL");
+                       }
                        if(assumeKernel == null || assumeKernel.length() == 0 
|| (!(assumeKernel.startsWith("2.2") || assumeKernel.startsWith("2.4")))) {
                                System.err.println(ERROR_SUN_NPTL);
                                Logger.error(this, ERROR_SUN_NPTL);

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-05-29 16:52:50 UTC (rev 
8924)
+++ trunk/freenet/src/freenet/node/Version.java 2006-05-29 17:06:40 UTC (rev 
8925)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 748;
+       private static final int buildNumber = 749;

        /** Oldest build of Fred we will talk to */
        private static final int lastGoodBuild = 732;