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

This closes #2783

This commit is contained in:
Michael Pearce 2019-08-19 16:53:58 +01:00
parent 37fd9fe6fd 3d631f06d0
commit e218678e4f
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ActiveMQInitialContextFactory.java
View File

@ -56,7 +56,7 @@ public class ActiveMQInitialContextFactory implements InitialContextFactory {
Map<String, Object> data = new ConcurrentHashMap<>();
String providerUrl = (String) environment.get(javax.naming.Context.PROVIDER_URL);
if (providerUrl != null) {
if (providerUrl != null && !providerUrl.isEmpty()) {
try {
JMSFactoryType providedFactoryType = getFactoryType(providerUrl);
if (providedFactoryType == null) {

12
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/SimpleJNDIClientTest.java
View File

@ -103,6 +103,18 @@ public class SimpleJNDIClientTest extends ActiveMQTestBase {
connectionFactory.createConnection().close();
}
@Test
public void testEmptyConnectionFactoryString() throws NamingException, JMSException {
Hashtable<String, String> props = new Hashtable<>();
props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
props.put("connectionFactory.ConnectionFactory", "vm://0");
//IIB v10 assumes this property is mandatory and sets it to an empty string when not specified
props.put("java.naming.provider.url", "");
new InitialContext(props);//Must not throw an exception
}
@Test
public void testVMCF1() throws NamingException, JMSException {
Hashtable<String, String> props = new Hashtable<>();