You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2015/10/05 18:10:14 UTC
qpid-jms git commit: QPIDJMS-120: while in here,
make lock field private and final
Repository: qpid-jms
Updated Branches:
refs/heads/master 89aeac152 -> febb811d9
QPIDJMS-120: while in here, make lock field private and final
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/febb811d
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/febb811d
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/febb811d
Branch: refs/heads/master
Commit: febb811d93cb2a502b115d9349cfc90ccb610370
Parents: 89aeac1
Author: Robert Gemmell <ro...@apache.org>
Authored: Mon Oct 5 17:05:03 2015 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Mon Oct 5 17:09:41 2015 +0100
----------------------------------------------------------------------
.../qpid/jms/util/AbstractMessageQueue.java | 2 +-
.../apache/qpid/jms/util/FifoMessageQueue.java | 18 +++++++++---------
.../qpid/jms/util/PriorityMessageQueue.java | 16 ++++++++--------
3 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/febb811d/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/AbstractMessageQueue.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/AbstractMessageQueue.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/AbstractMessageQueue.java
index fd50722..6bc3caa 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/AbstractMessageQueue.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/AbstractMessageQueue.java
@@ -26,7 +26,7 @@ public abstract class AbstractMessageQueue implements MessageQueue {
private volatile boolean closed;
private volatile boolean running;
- protected Object lock = new Object();
+ private final Object lock = new Object();
@Override
public final JmsInboundMessageDispatch peek() {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/febb811d/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/FifoMessageQueue.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/FifoMessageQueue.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/FifoMessageQueue.java
index b50e480..5fc11c6 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/FifoMessageQueue.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/FifoMessageQueue.java
@@ -31,44 +31,44 @@ public final class FifoMessageQueue extends AbstractMessageQueue {
@Override
public void enqueueFirst(JmsInboundMessageDispatch envelope) {
- synchronized (lock) {
+ synchronized (getLock()) {
list.addFirst(envelope);
- lock.notify();
+ getLock().notify();
}
}
@Override
public void enqueue(JmsInboundMessageDispatch envelope) {
- synchronized (lock) {
+ synchronized (getLock()) {
list.addLast(envelope);
- lock.notify();
+ getLock().notify();
}
}
@Override
public boolean isEmpty() {
- synchronized (lock) {
+ synchronized (getLock()) {
return list.isEmpty();
}
}
@Override
public int size() {
- synchronized (lock) {
+ synchronized (getLock()) {
return list.size();
}
}
@Override
public void clear() {
- synchronized (lock) {
+ synchronized (getLock()) {
list.clear();
}
}
@Override
public List<JmsInboundMessageDispatch> removeAll() {
- synchronized (lock) {
+ synchronized (getLock()) {
ArrayList<JmsInboundMessageDispatch> rc = new ArrayList<JmsInboundMessageDispatch>(list.size());
for (JmsInboundMessageDispatch entry : list) {
rc.add(entry);
@@ -80,7 +80,7 @@ public final class FifoMessageQueue extends AbstractMessageQueue {
@Override
public String toString() {
- synchronized (lock) {
+ synchronized (getLock()) {
return list.toString();
}
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/febb811d/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/PriorityMessageQueue.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/PriorityMessageQueue.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/PriorityMessageQueue.java
index 6e7c984..7d5fa3c 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/PriorityMessageQueue.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/PriorityMessageQueue.java
@@ -47,39 +47,39 @@ public final class PriorityMessageQueue extends AbstractMessageQueue {
@Override
public void enqueue(JmsInboundMessageDispatch envelope) {
- synchronized (lock) {
+ synchronized (getLock()) {
getList(envelope).addLast(envelope);
this.size++;
- lock.notify();
+ getLock().notify();
}
}
@Override
public void enqueueFirst(JmsInboundMessageDispatch envelope) {
- synchronized (lock) {
+ synchronized (getLock()) {
getList(MAX_PRIORITY).addFirst(envelope);
this.size++;
- lock.notify();
+ getLock().notify();
}
}
@Override
public boolean isEmpty() {
- synchronized (lock) {
+ synchronized (getLock()) {
return size == 0;
}
}
@Override
public int size() {
- synchronized (lock) {
+ synchronized (getLock()) {
return size;
}
}
@Override
public void clear() {
- synchronized (lock) {
+ synchronized (getLock()) {
for (int i = 0; i <= MAX_PRIORITY; i++) {
lists[i].clear();
}
@@ -89,7 +89,7 @@ public final class PriorityMessageQueue extends AbstractMessageQueue {
@Override
public List<JmsInboundMessageDispatch> removeAll() {
- synchronized (lock) {
+ synchronized (getLock()) {
ArrayList<JmsInboundMessageDispatch> result = new ArrayList<JmsInboundMessageDispatch>(size());
for (int i = MAX_PRIORITY; i >= 0; i--) {
List<JmsInboundMessageDispatch> list = lists[i];
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org