summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2014-02-21 20:16:37 +0000
committerRobert Godfrey <rgodfrey@apache.org>2014-02-21 20:16:37 +0000
commit26c1872638385ab7544aac2201a7cdaa3b38c228 (patch)
treeb0ce1d0d32d46808ebcbdfbbb4c8942f64bc4028 /qpid/java
parent07bcf1792bd28910baaa870f590e2d36b303aa1b (diff)
downloadqpid-python-26c1872638385ab7544aac2201a7cdaa3b38c228.tar.gz
QPID-5576 : [JMS AMQP 1.0] don't throw an exception if no properties file is specified for initial context factory
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1570698 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/jndi/PropertiesFileInitialContextFactory.java6
1 files changed, 0 insertions, 6 deletions
diff --git a/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/jndi/PropertiesFileInitialContextFactory.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/jndi/PropertiesFileInitialContextFactory.java
index 091ab41304..9fd7f0fa7f 100644
--- a/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/jndi/PropertiesFileInitialContextFactory.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/jndi/PropertiesFileInitialContextFactory.java
@@ -57,8 +57,6 @@ public class PropertiesFileInitialContextFactory implements InitialContextFactor
Map data = new ConcurrentHashMap();
String file = null;
- String fileName = (environment.containsKey(Context.PROVIDER_URL))
- ? (String)environment.get(Context.PROVIDER_URL) : System.getProperty(Context.PROVIDER_URL);
try
{
@@ -100,10 +98,6 @@ public class PropertiesFileInitialContextFactory implements InitialContextFactor
}
}
}
- else
- {
- throw new NamingException("No Provider URL specified.");
- }
}
catch (IOException ioe)
{