diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2008-02-28 16:51:12 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2008-02-28 16:51:12 +0000 |
| commit | af4f34d70b44b9fc8ebbb8230706f9e7b2a0ec38 (patch) | |
| tree | 0b96a684e8c0d080748e273629699474ac194d3c | |
| parent | 3d201e6c84c4b550aacea1702424193e2b1ff507 (diff) | |
| download | qpid-python-af4f34d70b44b9fc8ebbb8230706f9e7b2a0ec38.tar.gz | |
QPID-821 Set default to false for MultiIO and Buffer Limiting.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@632054 13f79535-47bb-0310-9956-ffa450edef68
6 files changed, 5 insertions, 7 deletions
diff --git a/java/broker/etc/config.xml b/java/broker/etc/config.xml index 2314b678de..369f1d25d0 100644 --- a/java/broker/etc/config.xml +++ b/java/broker/etc/config.xml @@ -32,8 +32,8 @@ <keystorePath>/path/to/keystore.ks</keystorePath> <keystorePassword>keystorepass</keystorePassword> </ssl>--> - <qpidnio>true</qpidnio> - <protectio>true</protectio> + <qpidnio>false</qpidnio> + <protectio>false</protectio> <transport>nio</transport> <port>5672</port> <sslport>8672</sslport> diff --git a/java/broker/etc/persistent_config.xml b/java/broker/etc/persistent_config.xml index 0c9552fd27..2143009711 100644 --- a/java/broker/etc/persistent_config.xml +++ b/java/broker/etc/persistent_config.xml @@ -28,7 +28,6 @@ <work>${QPID_WORK}</work> <conf>${prefix}/etc</conf> <connector> - <qpidnio>true</qpidnio> <transport>nio</transport> <port>5672</port> <sslport>8672</sslport> diff --git a/java/broker/etc/transient_config.xml b/java/broker/etc/transient_config.xml index 95ea975c3e..5b13090f4c 100644 --- a/java/broker/etc/transient_config.xml +++ b/java/broker/etc/transient_config.xml @@ -28,7 +28,6 @@ <work>${QPID_WORK}</work> <conf>${prefix}/etc</conf> <connector> - <qpidnio>true</qpidnio> <transport>nio</transport> <port>5672</port> <sslport>8672</sslport> diff --git a/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java b/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java index 1dcbb02d5c..23aaf56876 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java +++ b/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java @@ -94,7 +94,7 @@ public class ConnectorConfiguration public String certType; @Configured(path = "connector.qpidnio", - defaultValue = "true") + defaultValue = "false") public boolean _multiThreadNIO; diff --git a/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java b/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java index 5eb08c5e8d..0faacaabc1 100644 --- a/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java +++ b/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java @@ -213,7 +213,7 @@ public class AMQProtocolHandler extends IoHandlerAdapter e.printStackTrace(); } - if (!System.getProperties().containsKey("protectio") || Boolean.getBoolean("protectio")) + if (Boolean.getBoolean("protectio")) { try { diff --git a/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java b/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java index 18faade677..78b54a8de9 100644 --- a/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java +++ b/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java @@ -122,7 +122,7 @@ public class TransportConnection { SocketConnector result; // FIXME - this needs to be sorted to use the new Mina MultiThread SA. - if (!System.getProperties().containsKey("qpidnio") || Boolean.getBoolean("qpidnio")) + if (Boolean.getBoolean("qpidnio")) { _logger.warn("Using Qpid MultiThreaded NIO - " + (System.getProperties().containsKey("qpidnio") ? "Qpid NIO is new default" |