You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2018/03/15 11:01:46 UTC
[1/3] qpid-broker-j git commit: QPID-8130: [Broker-J] Fix comparator
for log file details
Repository: qpid-broker-j
Updated Branches:
refs/heads/7.0.x 3082fc1b8 -> ce05c23a5
QPID-8130: [Broker-J] Fix comparator for log file details
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/0e956813
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/0e956813
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/0e956813
Branch: refs/heads/7.0.x
Commit: 0e956813b0909ed08c8aac3b0b259d0b63d2d474
Parents: 3082fc1
Author: Oleksandr Rudyy <ol...@jpmchase.net>
Authored: Wed Mar 14 14:11:49 2018 +0000
Committer: Keith Wall <kw...@apache.org>
Committed: Thu Mar 15 10:25:53 2018 +0000
----------------------------------------------------------------------
.../org/apache/qpid/server/logging/logback/RolloverWatcher.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/0e956813/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/RolloverWatcher.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/RolloverWatcher.java b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/RolloverWatcher.java
index 82f385f..aaaf429 100644
--- a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/RolloverWatcher.java
+++ b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/RolloverWatcher.java
@@ -48,7 +48,7 @@ public class RolloverWatcher implements RollingPolicyDecorator.RolloverListener
@Override
public int compare(final LogFileDetails o1, final LogFileDetails o2)
{
- return (int) (o2.getLastModified() - o1.getLastModified());
+ return Long.compare(o2.getLastModified(), o1.getLastModified());
}
};
private final Path _activeFilePath;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/3] qpid-broker-j git commit: QPID-8115: [Broker-J][AMQP 1.0] Fix
symbolic descriptor for 'no local filter'
Posted by kw...@apache.org.
QPID-8115: [Broker-J][AMQP 1.0] Fix symbolic descriptor for 'no local filter'
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/ce05c23a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/ce05c23a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/ce05c23a
Branch: refs/heads/7.0.x
Commit: ce05c23a52ccfe539d75d05ab45f1bff0f668ef8
Parents: 1b860ff
Author: Alex Rudyy <or...@apache.org>
Authored: Wed Feb 28 20:37:50 2018 +0000
Committer: Keith Wall <kw...@apache.org>
Committed: Thu Mar 15 10:59:37 2018 +0000
----------------------------------------------------------------------
.../v1_0/type/messaging/codec/NoLocalFilterConstructor.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ce05c23a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/NoLocalFilterConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/NoLocalFilterConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/NoLocalFilterConstructor.java
index 86052c5..2774cde 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/NoLocalFilterConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/NoLocalFilterConstructor.java
@@ -33,7 +33,10 @@ public class NoLocalFilterConstructor extends AbstractDescribedTypeConstructor<N
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.org:jms-no-local-filter:list"), UnsignedLong.valueOf(0x0000468C00000003L)
+ Symbol.valueOf("apache.org:no-local-filter:list"),
+ UnsignedLong.valueOf(0x0000468C00000003L),
+ // This incorrect value was originally specified here - retaining solely for backwards compatibility
+ Symbol.valueOf("apache.org:jms-no-local-filter:list")
};
private static final NoLocalFilterConstructor INSTANCE = new NoLocalFilterConstructor();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/3] qpid-broker-j git commit: QPID-8113 : Incorrect symbolic
descriptor used for (JMS) selector filter
Posted by kw...@apache.org.
QPID-8113 : Incorrect symbolic descriptor used for (JMS) selector filter
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/1b860ff9
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/1b860ff9
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/1b860ff9
Branch: refs/heads/7.0.x
Commit: 1b860ff935b0384fd36d7b366e9a0b901f66dcf2
Parents: 0e95681
Author: rgodfrey <rg...@apache.org>
Authored: Wed Feb 28 14:42:51 2018 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Thu Mar 15 10:27:41 2018 +0000
----------------------------------------------------------------------
.../type/messaging/codec/JMSSelectorFilterConstructor.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/1b860ff9/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterConstructor.java
index a5a1227..96ea008 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterConstructor.java
@@ -35,8 +35,10 @@ public class JMSSelectorFilterConstructor extends AbstractDescribedTypeConstruct
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.org:jms-selector-filter:string"),
- UnsignedLong.valueOf(0x0000468C00000004L)
+ Symbol.valueOf("apache.org:selector-filter:string"),
+ UnsignedLong.valueOf(0x0000468C00000004L),
+ // This incorrect value was originally specified here - retaining solely for backwards compatibility
+ Symbol.valueOf("apache.org:jms-selector-filter:string")
};
private static final JMSSelectorFilterConstructor INSTANCE = new JMSSelectorFilterConstructor();
@@ -60,7 +62,7 @@ public class JMSSelectorFilterConstructor extends AbstractDescribedTypeConstruct
}
else
{
- final String msg = String.format("Cannot decode 'apache.org:jms-selector-filter' from '%s'",
+ final String msg = String.format("Cannot decode 'apache.org:selector-filter' from '%s'",
underlying == null ? null : underlying.getClass().getSimpleName());
throw new AmqpErrorException(AmqpError.DECODE_ERROR, msg);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org