Author: rajith
Date: Tue Aug 30 21:55:30 2011
New Revision: 1163422
URL: http://svn.apache.org/viewvc?rev=1163422&view=rev
Log:
QPID-3395 Applied Pavel's patch with minor modifications.
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java?rev=1163422&r1=1163421&r2=1163422&view=diff
==============================================================================
---
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
(original)
+++
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
Tue Aug 30 21:55:30 2011
@@ -36,6 +36,7 @@ import javax.jms.Queue;
import javax.jms.Topic;
import javax.naming.Context;
import javax.naming.NamingException;
+import javax.naming.ConfigurationException;
import javax.naming.spi.InitialContextFactory;
import org.apache.qpid.client.AMQConnectionFactory;
@@ -139,7 +140,7 @@ public class PropertiesFileInitialContex
return new ReadOnlyContext(environment, data);
}
- protected void createConnectionFactories(Map data, Hashtable environment)
+ protected void createConnectionFactories(Map data, Hashtable environment)
throws ConfigurationException
{
for (Iterator iter = environment.entrySet().iterator();
iter.hasNext();)
{
@@ -157,7 +158,7 @@ public class PropertiesFileInitialContex
}
}
- protected void createDestinations(Map data, Hashtable environment)
+ protected void createDestinations(Map data, Hashtable environment) throws
ConfigurationException
{
for (Iterator iter = environment.entrySet().iterator();
iter.hasNext();)
{
@@ -225,7 +226,7 @@ public class PropertiesFileInitialContex
/**
* Factory method to create new Connection Factory instances
*/
- protected ConnectionFactory createFactory(String url)
+ protected ConnectionFactory createFactory(String url) throws
ConfigurationException
{
try
{
@@ -233,16 +234,18 @@ public class PropertiesFileInitialContex
}
catch (URLSyntaxException urlse)
{
- _logger.warn("Unable to createFactories:" + urlse);
- }
+ _logger.warn("Unable to create factory:" + urlse);
- return null;
+ ConfigurationException ex = new ConfigurationException("Failed to
parse entry: " + urlse + " due to : " + urlse.getMessage());
+ ex.initCause(urlse);
+ throw ex;
+ }
}
/**
* Factory method to create new Destination instances from an AMQP
BindingURL
*/
- protected Destination createDestination(String str)
+ protected Destination createDestination(String str) throws
ConfigurationException
{
try
{
@@ -252,7 +255,9 @@ public class PropertiesFileInitialContex
{
_logger.warn("Unable to create destination:" + e, e);
- return null;
+ ConfigurationException ex = new ConfigurationException("Failed to
parse entry: " + str + " due to : " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
}
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
