db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r392363 - /db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.java
Date Fri, 07 Apr 2006 18:55:22 GMT
Author: djd
Date: Fri Apr  7 11:55:21 2006
New Revision: 392363

URL: http://svn.apache.org/viewcvs?rev=392363&view=rev
Log:
DERBY-1158 DERBY-1159 Remove special casing of network client for holdability tests
using executeUpdate methods.
Merge of 392084 from trunk.

Modified:
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.java

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.java
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.java?rev=392363&r1=392362&r2=392363&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.java
(original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.java
Fri Apr  7 11:55:21 2006
@@ -915,12 +915,10 @@
             xar.start(xid, XAResource.TMNOFLAGS);
             
             // Statements not returning ResultSet's should be ok
-            if (!TestUtil.isDerbyNetClientFramework()) { // DERBY-1159
             sdh.executeUpdate("DELETE FROM APP.FOO where A < -99");
             shh.executeUpdate("DELETE FROM APP.FOO where A < -99");
             sch.executeUpdate("DELETE FROM APP.FOO where A < -99");
-            }
-            
+           
             ArrayList openRS = new ArrayList();
             
             // Statements obtained while default was hold.
@@ -938,18 +936,14 @@
             openRS.add(psch.executeQuery());
             
             // Statements not returning ResultSet's should be ok
-            if (!TestUtil.isDerbyNetClientFramework()) { // DERBY-1159
             psdh_d.executeUpdate();
             pshh_d.executeUpdate();
             psch_d.executeUpdate();
-            }
-
+ 
             // Statements not returning ResultSet's should be ok
-            if (!TestUtil.isDerbyNetClientFramework()) { // DERBY-1159
             sdc.executeUpdate("DELETE FROM APP.FOO where A < -99");
             shc.executeUpdate("DELETE FROM APP.FOO where A < -99");
             scc.executeUpdate("DELETE FROM APP.FOO where A < -99");
-            }             
  
             // Statements obtained while default was close.
             // all should return close on commit ResultSets
@@ -963,11 +957,9 @@
             openRS.add(pscc.executeQuery());
             
             // Statements not returning ResultSet's should be ok
-            if (!TestUtil.isDerbyNetClientFramework()) { // DERBY-1159
             psdc_d.executeUpdate();
             pshc_d.executeUpdate();
             pscc_d.executeUpdate();
-            }
             
             // All the ResultSets should be open. Run a simple
             // test, clearWarnings throws an error if the ResultSet



Mime
View raw message