Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Shalin Shekhar Mangar 2009-05-05 10:24:11 +00:00
parent 6ef6e52271
commit d88af9cf8a
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
View File

@ -94,11 +94,9 @@ public class JdbcDataSource extends
protected Callable<Connection> createConnectionFactory(final Context context, protected Callable<Connection> createConnectionFactory(final Context context,
final Properties initProps) { final Properties initProps) {
final String jndiName = initProps.getProperty(JNDI_NAME);
final VariableResolver resolver = context.getVariableResolver(); final VariableResolver resolver = context.getVariableResolver();
resolveVariables(resolver, initProps); resolveVariables(resolver, initProps);
final String jndiName = initProps.getProperty(JNDI_NAME);
final String url = initProps.getProperty(URL); final String url = initProps.getProperty(URL);
final String driver = initProps.getProperty(DRIVER); final String driver = initProps.getProperty(DRIVER);