diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-08-09 16:05:05 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-08-09 16:05:05 +0000 |
| commit | c303d65ac74d5324b885da7cf7dbf655af8a93e2 (patch) | |
| tree | 55ef9bb4fa0dd091d84ad0c87cde63ae709e6513 /qpid/java/broker-core/src | |
| parent | b52953d99d197049e34a8e05d033e9f44b44f353 (diff) | |
| download | qpid-python-c303d65ac74d5324b885da7cf7dbf655af8a93e2.tar.gz | |
QPID-4429 : [Java] Implement max frame size negotiation checks in 0-x protocols
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1616977 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-core/src')
| -rw-r--r-- | qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java | 4 | ||||
| -rw-r--r-- | qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java index fb382a8ca9..ccda1e1fe1 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java @@ -40,10 +40,6 @@ public class BrokerProperties public static final String PROPERTY_DEFAULT_SUPPORTED_PROTOCOL_REPLY = "qpid.broker_default_supported_protocol_version_reply"; public static final String PROPERTY_DISABLED_FEATURES = "qpid.broker_disabled_features"; - private static final int DEFAULT_FRAME_SIZE = 65535; - public static final String PROPERTY_FRAME_SIZE = "qpid.broker_frame_size"; - public static final int FRAME_SIZE = Integer.getInteger(PROPERTY_FRAME_SIZE, DEFAULT_FRAME_SIZE); - public static final String PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_EXCLUDES = "qpid.broker_default_amqp_protocol_excludes"; public static final String PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_INCLUDES = "qpid.broker_default_amqp_protocol_includes"; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java index 7d49d0b85f..982ebb01c6 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java @@ -78,6 +78,11 @@ public interface Broker<X extends Broker<X>> extends ConfiguredObject<X>, EventL @ManagedContextDefault(name = BROKER_FLOW_TO_DISK_THRESHOLD) public static final long DEFAULT_FLOW_TO_DISK_THRESHOLD = (long)(0.4 * (double)Runtime.getRuntime().maxMemory()); + String BROKER_FRAME_SIZE = "qpid.broker_frame_size"; + @ManagedContextDefault(name = BROKER_FRAME_SIZE) + long DEFAULT_FRAME_SIZE = 65535; + + @DerivedAttribute String getBuildVersion(); |