From af4f34d70b44b9fc8ebbb8230706f9e7b2a0ec38 Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Thu, 28 Feb 2008 16:51:12 +0000
Subject: 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
---
 java/broker/etc/config.xml                                            | 4 ++--
 java/broker/etc/persistent_config.xml                                 | 1 -
 java/broker/etc/transient_config.xml                                  | 1 -
 .../java/org/apache/qpid/server/transport/ConnectorConfiguration.java | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'java/broker')

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;
 
 
-- 
cgit v1.2.1