From 559e9702d5a7c26dddee708e267f2f685d4de89e Mon Sep 17 00:00:00 2001
From: Aidan Skinner <aidan@apache.org>
Date: Thu, 24 Apr 2008 01:54:20 +0000
Subject: QPID-832 merge M2.x

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@651133 13f79535-47bb-0310-9956-ffa450edef68
---
 java/broker/pom.xml                                                   | 4 ++--
 java/broker/src/main/grammar/SelectorParser.jj                        | 2 +-
 .../java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java  | 2 +-
 .../java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java   | 2 +-
 .../java/org/apache/qpid/server/security/access/plugins/AllowAll.java | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'java/broker')

diff --git a/java/broker/pom.xml b/java/broker/pom.xml
index 153e186a26..53913f161f 100644
--- a/java/broker/pom.xml
+++ b/java/broker/pom.xml
@@ -22,14 +22,14 @@
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-incubating-M2.1-SNAPSHOT</version>
+    <version>1.0-incubating-M3-SNAPSHOT</version>
     <name>Qpid Broker</name>
     <url>http://cwiki.apache.org/confluence/display/qpid</url>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2.1-SNAPSHOT</version>
+        <version>1.0-incubating-M3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/java/broker/src/main/grammar/SelectorParser.jj b/java/broker/src/main/grammar/SelectorParser.jj
index f6a843e080..eb4467f1cc 100644
--- a/java/broker/src/main/grammar/SelectorParser.jj
+++ b/java/broker/src/main/grammar/SelectorParser.jj
@@ -94,7 +94,7 @@ public class SelectorParser {
             return this.JmsSelector();
         }
         catch (Throwable e) {
-	        throw (AMQInvalidArgumentException)new AMQInvalidArgumentException(sql).initCause(e);
+	        throw (AMQInvalidArgumentException)new AMQInvalidArgumentException(sql, e);
         }
 
     }
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
index 1a9dc6673a..636aa7eb03 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
@@ -67,7 +67,7 @@ public class DefaultExchangeFactory implements ExchangeFactory
         if (exchType == null)
         {
 
-            throw new AMQUnknownExchangeType("Unknown exchange type: " + type);
+            throw new AMQUnknownExchangeType("Unknown exchange type: " + type, null);
         }
         Exchange e = exchType.newInstance(_host, exchange, durable, ticket, autoDelete);
         return e;
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
index 9a98bc9659..97d25f650d 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
@@ -101,7 +101,7 @@ public class ExchangeDeclareHandler implements StateAwareMethodListener<Exchange
             else if (!exchange.getType().equals(body.getType()))
             {
 
-                throw new AMQConnectionException(AMQConstant.NOT_ALLOWED, "Attempt to redeclare exchange: " + body.getExchange() + " of type " + exchange.getType() + " to " + body.getType() +".",body.getClazz(), body.getMethod(),body.getMajor(),body.getMinor());
+                throw new AMQConnectionException(AMQConstant.NOT_ALLOWED, "Attempt to redeclare exchange: " + body.getExchange() + " of type " + exchange.getType() + " to " + body.getType() +".",body.getClazz(), body.getMethod(),body.getMajor(),body.getMinor(), null);
             }
 
         }
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java b/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java
index dee1676632..126ff22d69 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java
@@ -37,9 +37,9 @@ public class AllowAll implements ACLPlugin
 
     public AccessResult authorise(AMQProtocolSession session, Permission permission, AMQMethodBody body, Object... parameters)
     {
-        if (_logger.isDebugEnabled())
+        if (ACLManager.getLogger().isDebugEnabled())
         {
-            _logger.debug("Allowing user:" + session.getAuthorizedID() + " for :" + permission.toString()
+            ACLManager.getLogger().debug("Allowing user:" + session.getAuthorizedID() + " for :" + permission.toString()
                                         + " on " + body.getClass().getSimpleName()
                                         + (parameters == null || parameters.length == 0 ? "" : "-" + accessablesToString(parameters)));
         }
-- 
cgit v1.2.1