summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2012-06-04 21:41:12 +0000
committerRobert Gemmell <robbie@apache.org>2012-06-04 21:41:12 +0000
commit555a7eb522847d7dcc243d8a14925d958848aef4 (patch)
treeb33df18de6f157509100069d4d24bc34d203094f /qpid/java
parent0cdf8daf587dfa215f6a7d43a0b809db3e5c5b5c (diff)
downloadqpid-python-555a7eb522847d7dcc243d8a14925d958848aef4.tar.gz
QPID-3971: minor cleanup to remove unused variable and stop logging null when no provider URL is set as this case is later logged explicitly and more clearly
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1346171 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
index 935b4e7d9d..f17fb9b5f5 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
@@ -69,7 +69,6 @@ public class PropertiesFileInitialContextFactory implements InitialContextFactor
public Context getInitialContext(Hashtable environment) throws NamingException
{
Map data = new ConcurrentHashMap();
- File file = null;
BufferedInputStream inputStream = null;
try
{
@@ -77,11 +76,9 @@ public class PropertiesFileInitialContextFactory implements InitialContextFactor
String fileName = (environment.containsKey(Context.PROVIDER_URL))
? (String)environment.get(Context.PROVIDER_URL) : System.getProperty(Context.PROVIDER_URL);
- _logger.info("Attempting to load " + fileName);
-
-
if (fileName != null)
{
+ _logger.info("Attempting to load " + fileName);
inputStream = new BufferedInputStream(new FileInputStream((fileName.contains("file:"))
? new File(new URI(fileName)) : new File(fileName)));