From d88af9cf8a69a15681546d305a0340c2ba187470 Mon Sep 17 00:00:00 2001 From: Shalin Shekhar Mangar Date: Tue, 5 May 2009 10:24:11 +0000 Subject: [PATCH] SOLR-1076 followup -- Resolve JNDI name before using it git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@771656 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/solr/handler/dataimport/JdbcDataSource.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java b/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java index 2c1a790bd4a..4b8dcccc3b7 100644 --- a/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java +++ b/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java @@ -94,11 +94,9 @@ public class JdbcDataSource extends protected Callable 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);