You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jd...@apache.org on 2014/08/11 18:04:59 UTC
svn commit: r1617314 - in /lucene/dev/trunk/solr: CHANGES.txt
contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java
Author: jdyer
Date: Mon Aug 11 16:04:59 2014
New Revision: 1617314
URL: http://svn.apache.org/r1617314
Log:
SOLR-6363: fix test bug - shut down Derby properly
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1617314&r1=1617313&r2=1617314&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Mon Aug 11 16:04:59 2014
@@ -348,6 +348,8 @@ Other Changes
* SOLR-6362: Fix bug in TestSqlEntityProcessorDelta. (James Dyer)
+* SOLR-6363: Fix DIH JDBC tests to properly shut down embedded Derby db. (James Dyer)
+
================== 4.9.0 ==================
Versions of Major Components
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java?rev=1617314&r1=1617313&r2=1617314&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java Mon Aug 11 16:04:59 2014
@@ -74,7 +74,7 @@ public abstract class AbstractDIHJdbcTes
@AfterClass
public static void afterClassDihJdbcTest() throws Exception {
try {
- DriverManager.getConnection("jdbc:derby:;close=true;territory=en_US");
+ DriverManager.getConnection("jdbc:derby:;shutdown=true");
} catch (SQLException e) {
// ignore...we might not even be using derby this time...
}