diff options
| author | Robert Greig <rgreig@apache.org> | 2006-11-29 17:33:10 +0000 |
|---|---|---|
| committer | Robert Greig <rgreig@apache.org> | 2006-11-29 17:33:10 +0000 |
| commit | a14806948d841c98842a6b45aaf36250c13ef42b (patch) | |
| tree | 3647fdb939b004713292f13aab7e89c3f8e60b6e /java/broker/src | |
| parent | 1c7619d941e49d886e77280b3ec948611faea4b7 (diff) | |
| download | qpid-python-a14806948d841c98842a6b45aaf36250c13ef42b.tar.gz | |
Fixed up clustering and a few tests that were failing.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/new_persistence@480649 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker/src')
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java | 7 | ||||
| -rw-r--r-- | java/broker/src/main/log4j.properties | 6 |
2 files changed, 1 insertions, 12 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java index 73264c5310..f2cd0d13cd 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java +++ b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java @@ -450,11 +450,6 @@ public class AMQMessage _deliveredToConsumer = true; } - /*public void registerQueue(AMQQueue queue) - { - _destinationQueues.add(queue); - } */ - private void deliver() throws AMQException { // first we allow the handle to know that the message has been fully received. This is useful if it is @@ -531,7 +526,7 @@ public class AMQMessage return buf; } -private ByteBuffer createEncodedReturnFrame(int channelId, int replyCode, String replyText) throws AMQException + private ByteBuffer createEncodedReturnFrame(int channelId, int replyCode, String replyText) throws AMQException { AMQFrame returnFrame = BasicReturnBody.createAMQFrame(channelId, replyCode, replyText, getPublishBody().exchange, getPublishBody().routingKey); diff --git a/java/broker/src/main/log4j.properties b/java/broker/src/main/log4j.properties deleted file mode 100644 index 3ff6f0b581..0000000000 --- a/java/broker/src/main/log4j.properties +++ /dev/null @@ -1,6 +0,0 @@ -log4j.rootCategory=${amqj.logging.level}, console - -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.Threshold=info -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n |