db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r618476 - /db/derby/code/trunk/java/build/org/apache/derbyPreBuild/PropertySetter.java
Date Mon, 04 Feb 2008 22:39:17 GMT
Author: rhillegas
Date: Mon Feb  4 14:39:16 2008
New Revision: 618476

URL: http://svn.apache.org/viewvc?rev=618476&view=rev
Log:
DERBY-3117: Improve the PropertySetter so that it will work on Mac OS X with both the 10.4
and 10.5 versions of the operating system.

Modified:
    db/derby/code/trunk/java/build/org/apache/derbyPreBuild/PropertySetter.java

Modified: db/derby/code/trunk/java/build/org/apache/derbyPreBuild/PropertySetter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyPreBuild/PropertySetter.java?rev=618476&r1=618475&r2=618476&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyPreBuild/PropertySetter.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyPreBuild/PropertySetter.java Mon Feb  4
14:39:16 2008
@@ -103,7 +103,7 @@
     private static  final   String  JAVA_VERSION = "java.version";
     private static  final   String  OPERATING_SYSTEM = "os.name";
 
-    private static  final   String  JDK_APPLE = "Apple Computer, Inc.";
+    private static  final   String  JDK_APPLE = "Apple ";
     private static  final   String  JDK_IBM = "IBM Corporation";
     private static  final   String  JDK_SUN = "Sun Microsystems Inc.";
 
@@ -216,7 +216,9 @@
             //
             String  jdkVendor = getProperty( JDK_VENDOR );
 
-            if ( JDK_APPLE.equals( jdkVendor ) ) { setForAppleJDKs(); }
+            if ( jdkVendor == null ) { jdkVendor = ""; }
+
+            if (  jdkVendor.startsWith( JDK_APPLE ) ) { setForAppleJDKs(); }
             else if ( JDK_IBM.equals( jdkVendor ) ) { setForIbmJDKs(); }
             else if ( JDK_SUN.equals( jdkVendor ) ) { setForSunJDKs(); }
             



Mime
View raw message