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 2008/02/28 17:51:16 UTC
svn commit: r632054 - in /incubator/qpid/branches/M2.1/java: broker/etc/
broker/src/main/java/org/apache/qpid/server/transport/
client/src/main/java/org/apache/qpid/client/protocol/
client/src/main/java/org/apache/qpid/client/transport/
Author: ritchiem
Date: Thu Feb 28 08:51:12 2008
New Revision: 632054
URL: http://svn.apache.org/viewvc?rev=632054&view=rev
Log:
QPID-821 Set default to false for MultiIO and Buffer Limiting.
Modified:
incubator/qpid/branches/M2.1/java/broker/etc/config.xml
incubator/qpid/branches/M2.1/java/broker/etc/persistent_config.xml
incubator/qpid/branches/M2.1/java/broker/etc/transient_config.xml
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java
incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
Modified: incubator/qpid/branches/M2.1/java/broker/etc/config.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/etc/config.xml?rev=632054&r1=632053&r2=632054&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/broker/etc/config.xml (original)
+++ incubator/qpid/branches/M2.1/java/broker/etc/config.xml Thu Feb 28 08:51:12 2008
@@ -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>
Modified: incubator/qpid/branches/M2.1/java/broker/etc/persistent_config.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/etc/persistent_config.xml?rev=632054&r1=632053&r2=632054&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/broker/etc/persistent_config.xml (original)
+++ incubator/qpid/branches/M2.1/java/broker/etc/persistent_config.xml Thu Feb 28 08:51:12 2008
@@ -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>
Modified: incubator/qpid/branches/M2.1/java/broker/etc/transient_config.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/etc/transient_config.xml?rev=632054&r1=632053&r2=632054&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/broker/etc/transient_config.xml (original)
+++ incubator/qpid/branches/M2.1/java/broker/etc/transient_config.xml Thu Feb 28 08:51:12 2008
@@ -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>
Modified: incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java?rev=632054&r1=632053&r2=632054&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java (original)
+++ incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java Thu Feb 28 08:51:12 2008
@@ -94,7 +94,7 @@
public String certType;
@Configured(path = "connector.qpidnio",
- defaultValue = "true")
+ defaultValue = "false")
public boolean _multiThreadNIO;
Modified: incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java?rev=632054&r1=632053&r2=632054&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java (original)
+++ incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java Thu Feb 28 08:51:12 2008
@@ -213,7 +213,7 @@
e.printStackTrace();
}
- if (!System.getProperties().containsKey("protectio") || Boolean.getBoolean("protectio"))
+ if (Boolean.getBoolean("protectio"))
{
try
{
Modified: incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java?rev=632054&r1=632053&r2=632054&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java (original)
+++ incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java Thu Feb 28 08:51:12 2008
@@ -122,7 +122,7 @@
{
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"