diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2007-12-07 12:26:22 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2007-12-07 12:26:22 +0000 |
| commit | 04c7e8b7c69fb08f3205f6fd52f82967103251a4 (patch) | |
| tree | 98ba2b303bf8f39830f3e55804dff333d51c83e2 | |
| parent | 6ec93b4a33f4b8c34405ae2145cfe91bfff2bb8b (diff) | |
| download | qpid-python-04c7e8b7c69fb08f3205f6fd52f82967103251a4.tar.gz | |
Update to disable ProtectIO by default.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@602082 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | java/broker/etc/config.xml | 2 | ||||
| -rw-r--r-- | java/broker/etc/persistent_config.xml | 7 | ||||
| -rw-r--r-- | java/broker/etc/transient_config.xml | 5 | ||||
| -rw-r--r-- | java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/java/broker/etc/config.xml b/java/broker/etc/config.xml index b3b6a2877f..65699fbcac 100644 --- a/java/broker/etc/config.xml +++ b/java/broker/etc/config.xml @@ -33,7 +33,7 @@ <keystorePassword>keystorepass</keystorePassword> </ssl>--> <qpidnio>true</qpidnio> - <protectio>true</protectio> + <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 178a73515c..aa191ecc55 100644 --- a/java/broker/etc/persistent_config.xml +++ b/java/broker/etc/persistent_config.xml @@ -8,9 +8,9 @@ - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - + - - http://www.apache.org/licenses/LICENSE-2.0 - - + - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -22,13 +22,14 @@ This is an example config using the BDBMessageStore available from the Red Hat Messaging project at etp.108.redhat.com and distributed under GPL. --> - + <broker> <prefix>${QPID_HOME}</prefix> <work>${QPID_WORK}</work> <conf>${prefix}/etc</conf> <connector> <qpidnio>true</qpidnio> + <protectio>false</protectio> <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 164d66cd1b..e614eeff8c 100644 --- a/java/broker/etc/transient_config.xml +++ b/java/broker/etc/transient_config.xml @@ -8,9 +8,9 @@ - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - + - - http://www.apache.org/licenses/LICENSE-2.0 - - + - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,6 +29,7 @@ <conf>${prefix}/etc</conf> <connector> <qpidnio>true</qpidnio> + <protectio>false</protectio> <transport>nio</transport> <port>5672</port> <sslport>8672</sslport> 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 dd27f07a9a..b9e2b04459 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 @@ -220,7 +220,7 @@ public class AMQProtocolHandler extends IoHandlerAdapter e.printStackTrace(); } - if (!System.getProperties().containsKey("protectio") || Boolean.getBoolean("protectio")) + if (Boolean.getBoolean("protectio")) { try { |