Author: rgodfrey
Date: Sun Oct 9 15:25:03 2016
New Revision: 1763988
URL: http://svn.apache.org/viewvc?rev=1763988&view=rev
Log:
QPID-7455 : Attributes which reference other objects should be allowed to be
specified in terms of context variables
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractUnresolvedObject.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractUnresolvedObject.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractUnresolvedObject.java?rev=1763988&r1=1763987&r2=1763988&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractUnresolvedObject.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractUnresolvedObject.java
Sun Oct 9 15:25:03 2016
@@ -169,13 +169,15 @@ public abstract class AbstractUnresolved
}
else if(attrValue instanceof String)
{
+ String interpolatedValue =
AbstractConfiguredObject.interpolate(_parents[0], (String) attrValue);
+
try
{
- _unresolvedObjects.add(new IdDependency(clazz, attributeName,
UUID.fromString((String) attrValue)));
+ _unresolvedObjects.add(new IdDependency(clazz, attributeName,
UUID.fromString(interpolatedValue)));
}
catch(IllegalArgumentException e)
{
- _unresolvedObjects.add(new NameDependency(clazz,
attributeName, (String) attrValue));
+ _unresolvedObjects.add(new NameDependency(clazz,
attributeName, interpolatedValue));
}
}
else if(!clazz.isInstance(attrValue))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
