From 4ef2f5237550c996de8b7a0c8bed039719685756 Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Thu, 28 Feb 2008 16:58:43 +0000
Subject: QPID-822 Set default to false for JMSXUserID.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@632055 13f79535-47bb-0310-9956-ffa450edef68
---
 java/broker/etc/acl.config.xml                                   | 2 +-
 java/broker/etc/config.xml                                       | 2 +-
 java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'java')

diff --git a/java/broker/etc/acl.config.xml b/java/broker/etc/acl.config.xml
index 4de8168fcc..701b71dbec 100644
--- a/java/broker/etc/acl.config.xml
+++ b/java/broker/etc/acl.config.xml
@@ -52,7 +52,7 @@
         <enableDirectBuffers>false</enableDirectBuffers>
         <framesize>65535</framesize>
         <compressBufferOnQueue>false</compressBufferOnQueue>
-        <enableJMSXUserID>true</enableJMSXUserID>
+        <enableJMSXUserID>false</enableJMSXUserID>
     </advanced>
 
     <security>
diff --git a/java/broker/etc/config.xml b/java/broker/etc/config.xml
index 369f1d25d0..78d96e52fd 100644
--- a/java/broker/etc/config.xml
+++ b/java/broker/etc/config.xml
@@ -51,7 +51,7 @@
         <enableDirectBuffers>false</enableDirectBuffers>
         <framesize>65535</framesize>
         <compressBufferOnQueue>false</compressBufferOnQueue>
-        <enableJMSXUserID>true</enableJMSXUserID>
+        <enableJMSXUserID>false</enableJMSXUserID>
     </advanced>
 
     <security>
diff --git a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
index 3cb50d1d12..5542fbc9b6 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
@@ -118,7 +118,7 @@ public class AMQChannel
     private boolean _closing;
 
     @Configured(path = "advanced.enableJMSXUserID",
-                defaultValue = "true")
+                defaultValue = "false")
     public boolean ENABLE_JMSXUserID;
 
 
-- 
cgit v1.2.1