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/05/05 12:24:12 UTC
svn commit: r771656 -
/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
Author: shalin
Date: Tue May 5 10:24:11 2009
New Revision: 771656
URL: http://svn.apache.org/viewvc?rev=771656&view=rev
Log:
SOLR-1076 followup -- Resolve JNDI name before using it
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=771656&r1=771655&r2=771656&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 Tue May 5 10:24:11 2009
@@ -94,11 +94,9 @@
protected Callable<Connection> createConnectionFactory(final Context context,
final Properties initProps) {
- final String jndiName = initProps.getProperty(JNDI_NAME);
-
final VariableResolver resolver = context.getVariableResolver();
resolveVariables(resolver, initProps);
-
+ final String jndiName = initProps.getProperty(JNDI_NAME);
final String url = initProps.getProperty(URL);
final String driver = initProps.getProperty(DRIVER);