Author: rgodfrey
Date: Wed Jun 15 10:06:38 2016
New Revision: 1748537
URL: http://svn.apache.org/viewvc?rev=1748537&view=rev
Log:
QPID-6982 : Make awaiting timeout come from a context variable and not a
constant
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java?rev=1748537&r1=1748536&r2=1748537&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
Wed Jun 15 10:06:38 2016
@@ -2699,12 +2699,26 @@ public abstract class AbstractConfigured
getSecurityManager().authoriseDelete(object);
}
+ private int getAwaitAttainmentTimeout()
+ {
+ int awaitAttainmentTimeout;
+ try
+ {
+ awaitAttainmentTimeout = getContextValue(Integer.class,
AWAIT_ATTAINMENT_TIMEOUT);
+ }
+ catch (IllegalArgumentException e)
+ {
+ awaitAttainmentTimeout = DEFAULT_AWAIT_ATTAINMENT_TIMEOUT;
+ }
+ return awaitAttainmentTimeout;
+ }
+
protected final <C extends ConfiguredObject> C
awaitChildClassToAttainState(final Class<C> childClass, final String name)
{
ListenableFuture<C> attainedChildByName =
getAttainedChildByName(childClass, name);
try
{
- return (C) doSync(attainedChildByName,
VirtualHost.DEFAULT_AWAIT_ATTAINMENT_TIMEOUT, TimeUnit.MILLISECONDS);
+ return (C) doSync(attainedChildByName,
getAwaitAttainmentTimeout(), TimeUnit.MILLISECONDS);
}
catch (TimeoutException e)
{
@@ -2718,7 +2732,7 @@ public abstract class AbstractConfigured
ListenableFuture<C> attainedChildByName =
getAttainedChildById(childClass, id);
try
{
- return (C) doSync(attainedChildByName,
VirtualHost.DEFAULT_AWAIT_ATTAINMENT_TIMEOUT, TimeUnit.MILLISECONDS);
+ return (C) doSync(attainedChildByName,
getAwaitAttainmentTimeout(), TimeUnit.MILLISECONDS);
}
catch (TimeoutException e)
{
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java?rev=1748537&r1=1748536&r2=1748537&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
Wed Jun 15 10:06:38 2016
@@ -57,6 +57,10 @@ public interface ConfiguredObject<X exte
String CREATED_TIME = "createdTime";
+ String AWAIT_ATTAINMENT_TIMEOUT = "awaitAttainmentTimeout";
+ @ManagedContextDefault( name = AWAIT_ATTAINMENT_TIMEOUT)
+ public static final int DEFAULT_AWAIT_ATTAINMENT_TIMEOUT = 5000;
+
/**
* Get the universally unique identifier for the object
*
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java?rev=1748537&r1=1748536&r2=1748537&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
Wed Jun 15 10:06:38 2016
@@ -145,9 +145,6 @@ public interface VirtualHost<X extends V
@ManagedAttribute( defaultValue = "${" +
VIRTUALHOST_CONNECTION_THREAD_POOL_NUMBER_OF_SELECTORS + "}")
int getNumberOfSelectors();
- @ManagedContextDefault( name = "virtualhost.awaitAttainmentTimeout")
- public static final int DEFAULT_AWAIT_ATTAINMENT_TIMEOUT = 5000;
-
@DerivedAttribute( persist = true )
String getModelVersion();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
