Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "BUG-832 Add initial configuration for controller self mount"
[controller.git]
/
opendaylight
/
samples
/
simpleforwarding
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
samples
/
simpleforwarding
/
internal
/
SimpleBroadcastHandlerImpl.java
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 d2016b1f6337b6923662268ae7d8029d34ae85b0..96e36f413c485a2abb758741177ba01afc380953 100644
(file)
--- 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
@@
-12,12
+12,12
@@
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.Set;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.opendaylight.controller.sal.packet.Ethernet;
-import org.opendaylight.controller.sal.packet.IDataPacketService;
-import org.opendaylight.controller.sal.packet.IListenDataPacket;
import org.opendaylight.controller.sal.core.ConstructionException;
import org.opendaylight.controller.sal.core.Node;
import org.opendaylight.controller.sal.core.NodeConnector;
import org.opendaylight.controller.sal.core.ConstructionException;
import org.opendaylight.controller.sal.core.Node;
import org.opendaylight.controller.sal.core.NodeConnector;
+import org.opendaylight.controller.sal.packet.Ethernet;
+import org.opendaylight.controller.sal.packet.IDataPacketService;
+import org.opendaylight.controller.sal.packet.IListenDataPacket;
import org.opendaylight.controller.sal.packet.Packet;
import org.opendaylight.controller.sal.packet.PacketResult;
import org.opendaylight.controller.sal.packet.RawPacket;
import org.opendaylight.controller.sal.packet.Packet;
import org.opendaylight.controller.sal.packet.PacketResult;
import org.opendaylight.controller.sal.packet.RawPacket;
@@
-54,7
+54,7
@@
public class SimpleBroadcastHandlerImpl implements IBroadcastHandler, IListenDat
public PacketResult receiveDataPacket(RawPacket inPkt) {
/*
* note that this assumes that the protocol plugin will do appropriate
public PacketResult receiveDataPacket(RawPacket inPkt) {
/*
* note that this assumes that the protocol plugin will do appropriate
- * filtering to ensure that this only receives packets for it
'
s
+ * filtering to ensure that this only receives packets for its
* container.
*/
* container.
*/
@@
-93,6
+93,7
@@
public class SimpleBroadcastHandlerImpl implements IBroadcastHandler, IListenDat
lock.readLock().lock();
if (topoManager == null || dataPacketService == null
|| swMgr == null) {
lock.readLock().lock();
if (topoManager == null || dataPacketService == null
|| swMgr == null) {
+ lock.readLock().unlock();
return false;
}
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.");
log.error("Mode set to "
+ BroadcastMode.EXTERNAL_QUERY
+ ", but no external source of broadcast ports was provided.");
+ lock.readLock().unlock();
return false;
}
break;
return false;
}
break;
@@
-216,6
+218,7
@@
public class SimpleBroadcastHandlerImpl implements IBroadcastHandler, IListenDat
lock.writeLock().unlock();
}
lock.writeLock().unlock();
}
+ @Override
public void setMode(BroadcastMode m) {
lock.writeLock().lock();
mode = m;
public void setMode(BroadcastMode m) {
lock.writeLock().lock();
mode = m;