You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2007/12/07 13:26:22 UTC
svn commit: r602082 - in /incubator/qpid/branches/M2.1.1/java:
broker/etc/config.xml broker/etc/persistent_config.xml
broker/etc/transient_config.xml
client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
Author: ritchiem
Date: Fri Dec 7 04:26:22 2007
New Revision: 602082
URL: http://svn.apache.org/viewvc?rev=602082&view=rev
Log:
Update to disable ProtectIO by default.
Modified:
incubator/qpid/branches/M2.1.1/java/broker/etc/config.xml
incubator/qpid/branches/M2.1.1/java/broker/etc/persistent_config.xml
incubator/qpid/branches/M2.1.1/java/broker/etc/transient_config.xml
incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
Modified: incubator/qpid/branches/M2.1.1/java/broker/etc/config.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1.1/java/broker/etc/config.xml?rev=602082&r1=602081&r2=602082&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1.1/java/broker/etc/config.xml (original)
+++ incubator/qpid/branches/M2.1.1/java/broker/etc/config.xml Fri Dec 7 04:26:22 2007
@@ -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>
Modified: incubator/qpid/branches/M2.1.1/java/broker/etc/persistent_config.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1.1/java/broker/etc/persistent_config.xml?rev=602082&r1=602081&r2=602082&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1.1/java/broker/etc/persistent_config.xml (original)
+++ incubator/qpid/branches/M2.1.1/java/broker/etc/persistent_config.xml Fri Dec 7 04:26:22 2007
@@ -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>
Modified: incubator/qpid/branches/M2.1.1/java/broker/etc/transient_config.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1.1/java/broker/etc/transient_config.xml?rev=602082&r1=602081&r2=602082&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1.1/java/broker/etc/transient_config.xml (original)
+++ incubator/qpid/branches/M2.1.1/java/broker/etc/transient_config.xml Fri Dec 7 04:26:22 2007
@@ -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>
Modified: incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java?rev=602082&r1=602081&r2=602082&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java (original)
+++ incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java Fri Dec 7 04:26:22 2007
@@ -220,7 +220,7 @@
e.printStackTrace();
}
- if (!System.getProperties().containsKey("protectio") || Boolean.getBoolean("protectio"))
+ if (Boolean.getBoolean("protectio"))
{
try
{