commit 9af35cd91b497011dfeddff81b239f0808376be1
author pingping-lin <pingping@onlab.us> Fri Sep 05 15:22:39 2014 -0700
committer Saurav Das <sauravdas@alumni.stanford.edu> Thu Sep 11 12:54:16 2014 -0700
tree 4818ed649832a23cba7092d10881e40e3df82504
parent a313cde6eef85c0fe699e55ae3f0718f4f95bfad

fix arp when using default configuration

Change-Id: I0fc7474335d8d00caebaa93bf8cb3cca10213265

src/main/java/net/onrc/onos/core/packetservice/PacketModule.java

diff --git a/src/main/java/net/onrc/onos/core/packetservice/PacketModule.java b/src/main/java/net/onrc/onos/core/packetservice/PacketModule.java
index 9cf618a..4cfb9e7 100644
--- a/src/main/java/net/onrc/onos/core/packetservice/PacketModule.java
+++ b/src/main/java/net/onrc/onos/core/packetservice/PacketModule.java
@@ -132,8 +132,11 @@
     @Override
     public void broadcastPacketOutInternalEdge(Ethernet eth, SwitchPort inSwitchPort) {
 
-        Set<SwitchPort> blacklistSwitchPorts = new HashSet<SwitchPort>(configService
-                .getExternalSwitchPorts());
+        Set<SwitchPort> blacklistSwitchPorts = new HashSet<SwitchPort>();
+        Set<SwitchPort> externalSwitchPorts = configService.getExternalSwitchPorts();
+        if (externalSwitchPorts != null) {
+            blacklistSwitchPorts.addAll(externalSwitchPorts);
+        }
         blacklistSwitchPorts.add(inSwitchPort);
 
         BroadcastPacketOutNotification notification =