From 69228db0423bedd1d18b374c0f357762fa8021b2 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 18 Jan 2017 18:12:57 +0100 Subject: [PATCH] Fix FindBugs warning around locking Correct use of locks is to use a try/finally block, so correct the usage to shut FB up. Change-Id: I8e42425a9566f506682a8f3e2c25ac3dfe4ec812 Signed-off-by: Robert Varga --- .../actor/MeteredBoundedMailboxTest.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/common/actor/MeteredBoundedMailboxTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/common/actor/MeteredBoundedMailboxTest.java index 6142bf3ec5..d2e6b02490 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/common/actor/MeteredBoundedMailboxTest.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/common/actor/MeteredBoundedMailboxTest.java @@ -53,17 +53,19 @@ public class MeteredBoundedMailboxTest { actorSystem.mailboxes().settings(); lock.lock(); - //queue capacity = 10 - //need to send 12 messages; 1 message is dequeued and actor waits on lock, - //2nd to 11th messages are put on the queue - //12th message is sent to dead letter. - for (int i = 0; i < 12; i++) { - pingPongActor.tell("ping", mockReceiver.getRef()); - } - - mockReceiver.expectMsgClass(twentySeconds, DeadLetter.class); + try { + //queue capacity = 10 + //need to send 12 messages; 1 message is dequeued and actor waits on lock, + //2nd to 11th messages are put on the queue + //12th message is sent to dead letter. + for (int i = 0; i < 12; i++) { + pingPongActor.tell("ping", mockReceiver.getRef()); + } - lock.unlock(); + mockReceiver.expectMsgClass(twentySeconds, DeadLetter.class); + } finally { + lock.unlock(); + } mockReceiver.receiveN(11, twentySeconds); } -- 2.36.6