Author: ratchet
Date: 2008-09-14 17:35:01 +0000 (Sun, 14 Sep 2008)
New Revision: 22657

Modified:
   trunk/freenet/src/freenet/node/Node.java
Log:
fixed JRE check for FreeBSD. Different Vendor string for SUN Java


Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2008-09-14 17:28:53 UTC (rev 
22656)
+++ trunk/freenet/src/freenet/node/Node.java    2008-09-14 17:35:01 UTC (rev 
22657)
@@ -2036,13 +2036,14 @@
                // If we are running a Sun or Blackdown JVM, on Linux, and 
LD_ASSUME_KERNEL is not set, then we are.

                String jvmVendor = System.getProperty("java.vm.vendor");
+               String jvmSpecVendor = 
System.getProperty("java.specification.vendor","");
                String jvmVersion = System.getProperty("java.version");
                String osName = System.getProperty("os.name");
                String osVersion = System.getProperty("os.version");

                if(logMINOR) Logger.minor(this, "JVM vendor: "+jvmVendor+", JVM 
version: "+jvmVersion+", OS name: "+osName+", OS version: "+osVersion);

-               if(jvmVendor.startsWith("Sun ")) {
+               if(jvmVendor.startsWith("Sun ") || (jvmVendor.startsWith("The 
FreeBSD Foundation") && jvmSpecVendor.startsWith("Sun "))) {
                        // Sun bugs

                        // Spurious OOMs


Reply via email to