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 2014/06/12 10:15:28 UTC
svn commit: r1602090 - in /db/derby/code/branches/10.10: ./
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/StatementPoolingTest.java
Author: kahatlen
Date: Thu Jun 12 08:15:28 2014
New Revision: 1602090
URL: http://svn.apache.org/r1602090
Log:
DERBY-6613: StatementPoolingTest fails on JDK 9
Merged revision 1602087 from trunk.
Modified:
db/derby/code/branches/10.10/ (props changed)
db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/StatementPoolingTest.java
Propchange: db/derby/code/branches/10.10/
------------------------------------------------------------------------------
Merged /db/derby/code/trunk:r1602087
Modified: db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/StatementPoolingTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/StatementPoolingTest.java?rev=1602090&r1=1602089&r2=1602090&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/StatementPoolingTest.java (original)
+++ db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/StatementPoolingTest.java Thu Jun 12 08:15:28 2014
@@ -183,7 +183,8 @@ public class StatementPoolingTest
final String simpleName = names[names.length -1];
if (JDBC.vmSupportsJDBC4() && !expectedName.endsWith("40")) {
- if ( isJava8() && expectedName.contains( "Statement" ) )
+ if (JDBC.vmSupportsJDBC42()
+ && expectedName.contains("Statement"))
{
expectedName += "42";
}