db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r594397 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java
Date Tue, 13 Nov 2007 02:41:01 GMT
Author: myrnavl
Date: Mon Nov 12 18:40:59 2007
New Revision: 594397

URL: http://svn.apache.org/viewvc?rev=594397&view=rev
Log:
DERBY-2903 ; logic in previous check-in was off, prevented any of the test 
  cases to run with J2ME/JSR169 instead of skipping just client/server jars.   

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java?rev=594397&r1=594396&r2=594397&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java
Mon Nov 12 18:40:59 2007
@@ -211,14 +211,15 @@
 
     public boolean checkClientOrServer(String kind)
     {
-        // JSR169 / J2ME does not support client or server
-        if (JDBC.vmSupportsJSR169())
-            return false;
-
         if (kind == null)
             return true;
         // if there is no derbynet.jar, the syntax should still
         // work, but the comparisons will fail. So never mind.
+        // JSR169 / J2ME does not support client or server
+        if ((kind.equals("server") || kind.equals("client")) 
+                && JDBC.vmSupportsJSR169())
+            return false;
+
         if (kind.equals("server")) 
             return isServer;
         // same for derbyclient.jar



Mime
View raw message