You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2016/03/09 15:39:28 UTC
svn commit: r1734245 - in
/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model:
ConfiguredObjectFactoryImpl.java NoFactoryForTypeException.java
Author: rgodfrey
Date: Wed Mar 9 14:39:27 2016
New Revision: 1734245
URL: http://svn.apache.org/viewvc?rev=1734245&view=rev
Log:
QPID-6958 : Improve handling of configured object creation where the configured type is not known
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/NoFactoryForTypeException.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryImpl.java?rev=1734245&r1=1734244&r2=1734245&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryImpl.java Wed Mar 9 14:39:27 2016
@@ -167,7 +167,10 @@ public class ConfiguredObjectFactoryImpl
ConfiguredObjectTypeFactory factory = categoryFactories.get(type);
if(factory == null)
{
- factory = categoryFactories.get(_defaultTypes.get(category));
+ if(type == null || "".equals(type.trim()))
+ {
+ factory = categoryFactories.get(_defaultTypes.get(category));
+ }
if(factory == null)
{
throw new NoFactoryForTypeException(category, type);
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/NoFactoryForTypeException.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/NoFactoryForTypeException.java?rev=1734245&r1=1734244&r2=1734245&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/NoFactoryForTypeException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/NoFactoryForTypeException.java Wed Mar 9 14:39:27 2016
@@ -20,7 +20,9 @@
*/
package org.apache.qpid.server.model;
-public class NoFactoryForTypeException extends RuntimeException
+import org.apache.qpid.server.configuration.IllegalConfigurationException;
+
+public class NoFactoryForTypeException extends IllegalConfigurationException
{
private final String _category;
private final String _type;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org