You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by sh...@apache.org on 2009/04/06 01:06:52 UTC
svn commit: r762184 -
/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
Author: shalin
Date: Sun Apr 5 23:06:52 2009
New Revision: 762184
URL: http://svn.apache.org/viewvc?rev=762184&view=rev
Log:
SOLR-1058 followup -- Fix check for driver attribute
Modified:
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java?rev=762184&r1=762183&r2=762184&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java Sun Apr 5 23:06:52 2009
@@ -113,7 +113,7 @@
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Could not load driver: " + driver, e);
}
} else {
- if(jndiName != null){
+ if(jndiName == null){
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Driver must be specified");
}
}
@@ -373,8 +373,8 @@
protected void finalize() throws Throwable {
try {
conn.close();
- } finally {
- super.finalize();
+ } finally {
+ super.finalize();
}
}