esthetic changes

@@ -156,9 +156,7 @@ public class ReactiveForwarding {
     private void installRule(PacketContext context, PortNumber portNumber) {
     private void installRule(PacketContext context, PortNumber portNumber) {
         // we don't yet support bufferids in the flowservice so packet out and
         // we don't yet support bufferids in the flowservice so packet out and
         // then install a flowmod.
         // then install a flowmod.
-        context.treatmentBuilder().add(Instructions.createOutput(portNumber));
-        context.send();
-
+        packetOutFlood(context);
 
 
         Ethernet inPkt = context.inPacket().parsed();
         Ethernet inPkt = context.inPacket().parsed();
         TrafficSelector.Builder builder = new DefaultTrafficSelector.Builder();
         TrafficSelector.Builder builder = new DefaultTrafficSelector.Builder();

@@ -78,7 +78,8 @@ public final class DefaultOpenFlowPacketContext implements OpenFlowPacketContext
         return new Dpid(sw.getId());
         return new Dpid(sw.getId());
     }
     }
 
 
-    public static OpenFlowPacketContext packetContextFromPacketIn(OpenFlowSwitch s, OFPacketIn pkt) {
+    public static OpenFlowPacketContext packetContextFromPacketIn(OpenFlowSwitch s,
+            OFPacketIn pkt) {
         return new DefaultOpenFlowPacketContext(s, pkt);
         return new DefaultOpenFlowPacketContext(s, pkt);
     }
     }
 
 

@@ -53,8 +53,6 @@ public class Controller {
     protected static final OFFactory FACTORY13 = OFFactories.getFactory(OFVersion.OF_13);
     protected static final OFFactory FACTORY13 = OFFactories.getFactory(OFVersion.OF_13);
     protected static final OFFactory FACTORY10 = OFFactories.getFactory(OFVersion.OF_10);
     protected static final OFFactory FACTORY10 = OFFactories.getFactory(OFVersion.OF_10);
 
 
-
-
     // The controllerNodeIPsCache maps Controller IDs to their IP address.
     // The controllerNodeIPsCache maps Controller IDs to their IP address.
     // It's only used by handleControllerNodeIPsChanged
     // It's only used by handleControllerNodeIPsChanged
     protected HashMap<String, String> controllerNodeIPsCache;
     protected HashMap<String, String> controllerNodeIPsCache;
@@ -68,16 +66,12 @@ public class Controller {
     // Start time of the controller
     // Start time of the controller
     protected long systemStartTime;
     protected long systemStartTime;
 
 
-    // Flag to always flush flow table on switch reconnect (HA or otherwise)
-    protected boolean alwaysClearFlowsOnSwAdd = false;
     private OpenFlowAgent agent;
     private OpenFlowAgent agent;
 
 
     private NioServerSocketChannelFactory execFactory;
     private NioServerSocketChannelFactory execFactory;
 
 
     // Perf. related configuration
     // Perf. related configuration
     protected static final int SEND_BUFFER_SIZE = 4 * 1024 * 1024;
     protected static final int SEND_BUFFER_SIZE = 4 * 1024 * 1024;
-    protected static final int BATCH_MAX_SIZE = 100;
-    protected static final boolean ALWAYS_DECODE_ETH = true;
 
 
     // ***************
     // ***************
     // Getters/Setters
     // Getters/Setters

@@ -538,43 +538,41 @@ class OFChannelHandler extends IdleStateAwareChannelHandler {
             @Override
             @Override
             void processOFStatisticsReply(OFChannelHandler h,
             void processOFStatisticsReply(OFChannelHandler h,
                     OFStatsReply m) {
                     OFStatsReply m) {
-                h.sw.handleMessage(m);
+                h.dispatchMessage(m);
             }
             }
 
 
             @Override
             @Override
             void processOFExperimenter(OFChannelHandler h, OFExperimenter m)
             void processOFExperimenter(OFChannelHandler h, OFExperimenter m)
-                    throws IOException, SwitchStateException {
+                    throws SwitchStateException {
                 h.sw.handleNiciraRole(m);
                 h.sw.handleNiciraRole(m);
             }
             }
 
 
             @Override
             @Override
             void processOFRoleReply(OFChannelHandler h, OFRoleReply m)
             void processOFRoleReply(OFChannelHandler h, OFRoleReply m)
-                    throws SwitchStateException, IOException {
+                    throws SwitchStateException {
                 h.sw.handleRole(m);
                 h.sw.handleRole(m);
             }
             }
 
 
             @Override
             @Override
             void processOFPortStatus(OFChannelHandler h, OFPortStatus m)
             void processOFPortStatus(OFChannelHandler h, OFPortStatus m)
-                    throws IOException, SwitchStateException {
+                    throws SwitchStateException {
                 handlePortStatusMessage(h, m, true);
                 handlePortStatusMessage(h, m, true);
                 h.dispatchMessage(m);
                 h.dispatchMessage(m);
             }
             }
 
 
             @Override
             @Override
-            void processOFPacketIn(OFChannelHandler h, OFPacketIn m)
-                    throws IOException {
+            void processOFPacketIn(OFChannelHandler h, OFPacketIn m) {
                 h.dispatchMessage(m);
                 h.dispatchMessage(m);
             }
             }
 
 
             @Override
             @Override
             void processOFFlowRemoved(OFChannelHandler h,
             void processOFFlowRemoved(OFChannelHandler h,
-                    OFFlowRemoved m) throws IOException {
+                    OFFlowRemoved m) {
                 h.dispatchMessage(m);
                 h.dispatchMessage(m);
             }
             }
 
 
             @Override
             @Override
-            void processOFBarrierReply(OFChannelHandler h, OFBarrierReply m)
-                    throws IOException {
+            void processOFBarrierReply(OFChannelHandler h, OFBarrierReply m) {
                 h.dispatchMessage(m);
                 h.dispatchMessage(m);
             }
             }
 
 
@@ -1092,7 +1090,7 @@ class OFChannelHandler extends IdleStateAwareChannelHandler {
         return this.state.isHandshakeComplete();
         return this.state.isHandshakeComplete();
     }
     }
 
 
-    private void dispatchMessage(OFMessage m) throws IOException {
+    private void dispatchMessage(OFMessage m) {
         sw.handleMessage(m);
         sw.handleMessage(m);
     }
     }