svn commit: r686619 - /lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java

[sh...@apache.org]

Author: shalin
Date: Sun Aug 17 08:41:59 2008
New Revision: 686619

URL: http://svn.apache.org/viewvc?rev=686619&view=rev
Log:
Do not try to create connections at core startup

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=686619&r1=686618&r2=686619&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 Aug 17 08:41:59 2008
@@ -45,7 +45,7 @@
 
   private Callable<Connection> factory;
 
-  private long connLastUsed = System.currentTimeMillis();
+  private long connLastUsed = 0;
 
   private Connection conn;
 
@@ -61,12 +61,6 @@
       convertType = Boolean.parseBoolean(o.toString());
 
     createConnectionFactory(context, initProps);
-    try {
-      conn = factory.call();
-    } catch (Exception e) {
-      throw new DataImportHandlerException(DataImportHandlerException.SEVERE,
-              "Unable to create database connection", e);
-    }
 
     String bsz = initProps.getProperty("batchSize");
     if (bsz != null) {
@@ -287,7 +281,7 @@
     if (currTime - connLastUsed > CONN_TIME_OUT) {
       synchronized (this) {
         Connection tmpConn = factory.call();
-        finalize();
+        close();
         connLastUsed = System.currentTimeMillis();
         return conn = tmpConn;
       }