From: Flavio Fernandes <ffernand@redhat.com>
Date: Mon, 21 Apr 2014 22:52:56 +0000 (-0400)
Subject: Bug-780: potential lock release being missed if error code path happens in SimpleBroa... 
X-Git-Tag: autorelease-tag-v20140601202136_82eb3f9~190^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=5cef4bb35c193f0965777198d6df63cba7bc6770;ds=inline

Bug-780: potential lock release being missed if error code path happens in SimpleBroadcastHandlerImpl.java

Change-Id: Ie8749e5dfcb04042922293ed45e8f06d42de90ab
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
---

diff --git a/opendaylight/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/internal/SimpleBroadcastHandlerImpl.java b/opendaylight/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/internal/SimpleBroadcastHandlerImpl.java
index e39ae65693..96e36f413c 100644
--- a/opendaylight/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/internal/SimpleBroadcastHandlerImpl.java
+++ b/opendaylight/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/internal/SimpleBroadcastHandlerImpl.java
@@ -93,6 +93,7 @@ public class SimpleBroadcastHandlerImpl implements IBroadcastHandler, IListenDat
         lock.readLock().lock();
         if (topoManager == null || dataPacketService == null
             || swMgr == null) {
+            lock.readLock().unlock();
             return false;
         }
 
@@ -124,6 +125,7 @@ public class SimpleBroadcastHandlerImpl implements IBroadcastHandler, IListenDat
                     log.error("Mode set to "
                               + BroadcastMode.EXTERNAL_QUERY
                               + ", but no external source of broadcast ports was provided.");
+                    lock.readLock().unlock();
                     return false;
                 }
                 break;