db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r447462 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/DerbyNetClient/checkDataSource.out master/DerbyNetClient/checkDataSource30.out tests/jdbcapi/checkDataSource.java
Date Mon, 18 Sep 2006 16:35:27 GMT
Author: kahatlen
Date: Mon Sep 18 09:35:25 2006
New Revision: 447462

URL: http://svn.apache.org/viewvc?view=rev&rev=447462
Log:
DERBY-1326: Network server may abandon sessions when Derby system is
shutdown and this causes intermittent hangs in the client

Re-enable shutdown in checkDataSource test.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDataSource.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDataSource30.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDataSource.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDataSource.out?view=diff&rev=447462&r1=447461&r2=447462
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDataSource.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDataSource.out
Mon Sep 18 09:35:25 2006
@@ -85,6 +85,7 @@
 IDENTITY_VAL_LOCAL=2
 IDENTITY_VAL_LOCAL=3
 End testPoolReset XADataSource
+ERROR XJ015: DERBY SQL error: SQLCODE: -1, SQLSTATE: XJ015, SQLERRMC: Derby system shutdown.
 Running connection checks on DriverManager 
   isolation level 2
   auto commit     true

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDataSource30.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDataSource30.out?view=diff&rev=447462&r1=447461&r2=447462
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDataSource30.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDataSource30.out
Mon Sep 18 09:35:25 2006
@@ -100,6 +100,7 @@
 IDENTITY_VAL_LOCAL=2
 IDENTITY_VAL_LOCAL=3
 End testPoolReset XADataSource
+ERROR XJ015: DERBY SQL error: SQLCODE: -1, SQLSTATE: XJ015, SQLERRMC: Derby system shutdown.
 Running JDBC 3.0 connection checks on DriverManager 
   holdability     true
 JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource.java?view=diff&rev=447462&r1=447461&r2=447462
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource.java
Mon Sep 18 09:35:25 2006
@@ -78,10 +78,6 @@
 	// Only embedded supports SimpleDataSource (JSR169).  
 	// These tests are exempted from other frameworks
 	private boolean testSimpleDataSource = TestUtil.isEmbeddedFramework();
-	
-    // DERBY-1326 - Network server may abandon sessions when Derby system is shutdown
-    // and this causes intermittent hangs in the client
-	private static boolean hangAfterSystemShutdown = TestUtil.isDerbyNetClientFramework();
 
 	/**
      * A hashtable of opened connections.  This is used when checking to
@@ -279,14 +275,10 @@
 
 		testPoolReset("XADataSource", dsx.getXAConnection());
 
-
-		// DERBY-1326 - hang in client after Derby system shutdown
-		if(! hangAfterSystemShutdown) {
-			try {
-				TestUtil.getConnection("","shutdown=true");
-			} catch (SQLException sqle) {
-				JDBCDisplayUtil.ShowSQLException(System.out, sqle);
-			}
+		try {
+			TestUtil.getConnection("","shutdown=true");
+		} catch (SQLException sqle) {
+			JDBCDisplayUtil.ShowSQLException(System.out, sqle);
 		}
 
 		dmc = ij.startJBMS();



Mime
View raw message