You are viewing a plain text version of this content. The canonical link for it is here.

Posted to derby-commits@db.apache.org by ka...@apache.org on 2010/10/29 10:41:11 UTC

svn commit: r1028643 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java

Author: kahatlen
Date: Fri Oct 29 08:41:11 2010
New Revision: 1028643

URL: http://svn.apache.org/viewvc?rev=1028643&view=rev
Log:
DERBY-4867: Update BaseTestCase.isSunJVM() to accept Oracle

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java?rev=1028643&r1=1028642&r2=1028643&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java Fri Oct 29 08:41:11 2010
@@ -559,8 +559,9 @@ public abstract class BaseTestCase
     }
 
     public static final boolean isSunJVM() {
-        return ("Sun Microsystems Inc.".equals(
-                getSystemProperty("java.vendor")));
+        String vendor = getSystemProperty("java.vendor");
+        return "Sun Microsystems Inc.".equals(vendor) ||
+                "Oracle Corporation".equals(vendor);
     }
     
     public static final boolean isIBMJVM() {