db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r156229 - in incubator/derby/code/trunk/java: drda/org/apache/derby/impl/drda/ testing/org/apache/derbyTesting/functionTests/suites/ testing/org/apache/derbyTesting/functionTests/tests/derbynet/
Date Sat, 05 Mar 2005 05:01:16 GMT
Author: kmarsden
Date: Fri Mar  4 21:01:13 2005
New Revision: 156229

URL: http://svn.apache.org/viewcvs?view=rev&rev=156229
Log:
Move autostart into derbynetmats suite and out of its own suite.

Fix for client xa jdk131


Added:
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetAutoStart_app.properties
  (with props)
Removed:
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetautostart.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetautostart.runall
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientautostart.properties
Modified:
    incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetNewServer_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/copyfiles.ant

Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java?view=diff&r1=156228&r2=156229
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java Fri
Mar  4 21:01:13 2005
@@ -501,8 +501,12 @@
 			return ps;
 		}
 		parsePkgidToFindHoldability();
-		ps = prepareStatementJDBC3(sqlStmt, scrollType, concurType, 
-								   withHoldCursor);
+		Connection conn = database.getConnection();
+		if (conn instanceof BrokeredConnection)
+			ps = conn.prepareStatement(sqlStmt, scrollType, concurType);
+		else
+			ps = prepareStatementJDBC3(sqlStmt, scrollType, concurType, 
+									   withHoldCursor);
 		// beetle 3849  -  Need to change the cursor name to what
 		// JCC thinks it will be, since there is no way in the 
 		// protocol to communicate the actual cursor name.  JCC keeps 
@@ -1615,6 +1619,7 @@
 			}
 			else
 			{
+				t.printStackTrace();
 				throw Util.javaException(t);
 			}
 		}

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties?view=diff&r1=156228&r2=156229
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties
Fri Mar  4 21:01:13 2005
@@ -1,3 +1,3 @@
-suites=derbylang derbynetmats derbynetautostart storeall xa derbytools jdbc20 jdk14 jdbcapi
encryptionAll nist demo multi unit
+suites=derbylang derbynetmats storeall xa derbytools jdbc20 jdk14 jdbcapi encryptionAll nist
demo multi unit
 derby.debug.true=enableBtreeConsistencyCheck
 derby.stream.error.logSeverityLevel=0

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.properties?view=diff&r1=156228&r2=156229
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.properties
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.properties
Fri Mar  4 21:01:13 2005
@@ -1,5 +1,5 @@
 framework=DerbyNetClient
-suites=derbynetmats derbynetclientautostart multi
+suites= derbynetclientmats derbynetmats
 jdk12test=true
 runwithj9=false
 timeout=60

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall?view=diff&r1=156228&r2=156229
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall
Fri Mar  4 21:01:13 2005
@@ -5,6 +5,8 @@
 derbynet/csPrepStmt.java
 derbynet/dblook_test_net.java
 derbynet/dataSourcePermissions_net.java
+derbynet/DerbyNetAutoStart.java
+derbynet/DerbyNetNewServer.java
 derbynet/executeUpdate.java
 derbynet/getCurrentProperties.java
 derbynet/maxthreads.java

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetAutoStart_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetAutoStart_app.properties?view=auto&rev=156229
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetAutoStart_app.properties
(added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetAutoStart_app.properties
Fri Mar  4 21:01:13 2005
@@ -0,0 +1 @@
+startServer=false

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetAutoStart_app.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetNewServer_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetNewServer_app.properties?view=diff&r1=156228&r2=156229
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetNewServer_app.properties
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetNewServer_app.properties
Fri Mar  4 21:01:13 2005
@@ -1,3 +1,4 @@
-# the test exercises a known JDK 1.3.1 bug. Fixed with the 1.4 jvms. 
-runwithjdk13=false
-runwithibm13=false
+# the test exercises a known JDK 1.3.1 bug. Fixed with the 1.4 jvms. 
+runwithjdk13=false
+runwithibm13=false
+startServer=false

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/copyfiles.ant
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/copyfiles.ant?view=diff&r1=156228&r2=156229
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/copyfiles.ant
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/copyfiles.ant
Fri Mar  4 21:01:13 2005
@@ -1,3 +1,4 @@
+DerbyNetAutoStart_app.properties
 DerbyNetNewServer_app.properties
 NSinSameJVM_app.properties
 badConnection_sed.properties



Mime
View raw message