Projects information

Chunk

Conflicting content
private final TimedCache timedCache; private final ReentrantReadWriteLock listenerLock; private final ConcurrentMap portBroadcastCacheHitMap; <<<<<<< HEAD ======= >>>>>>> d557724a9754431c4280f2c964647f6b75474891 protected final static ThreadLocal>> local_msg_buffer = new ThreadLocal>>() { @Override

Conflicting content

    private final TimedCache timedCache;
    private final ReentrantReadWriteLock listenerLock;
    private final ConcurrentMap portBroadcastCacheHitMap;
<<<<<<< HEAD


=======


>>>>>>> d557724a9754431c4280f2c964647f6b75474891
    protected final static ThreadLocal>> local_msg_buffer =
            new ThreadLocal>>() {
        @Override

Solution content
private final TimedCache timedCache; private final ReentrantReadWriteLock listenerLock; private final ConcurrentMap portBroadcastCacheHitMap; protected final static ThreadLocal>> local_msg_buffer = new ThreadLocal>>() { @Override

Solution content

    private final TimedCache timedCache;
    private final ReentrantReadWriteLock listenerLock;
    private final ConcurrentMap portBroadcastCacheHitMap;


    protected final static ThreadLocal>> local_msg_buffer =
            new ThreadLocal>>() {
        @Override

File
OFSwitchBase.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content
try { List msglist = new ArrayList(1); msglist.add(fm); <<<<<<< HEAD write(msglist); msglist = new ArrayList(1); msglist.add(barrierMsg); write(msglist); ======= channel.write(msglist); msglist = new ArrayList(1); msglist.add(barrierMsg); channel.write(msglist); >>>>>>> d557724a9754431c4280f2c964647f6b75474891 } catch (Exception e) { log.error("Failed to clear all flows on switch " + this, e); }

Conflicting content

        try {
            List msglist = new ArrayList(1);
            msglist.add(fm);
<<<<<<< HEAD
            write(msglist);
            msglist = new ArrayList(1);
            msglist.add(barrierMsg);
            write(msglist);
=======
            channel.write(msglist);
            msglist = new ArrayList(1);
            msglist.add(barrierMsg);
            channel.write(msglist);
>>>>>>> d557724a9754431c4280f2c964647f6b75474891
        } catch (Exception e) {
            log.error("Failed to clear all flows on switch " + this, e);
        }

Solution content
try { List msglist = new ArrayList(1); msglist.add(fm); write(msglist); msglist = new ArrayList(1); msglist.add(barrierMsg); write(msglist); } catch (Exception e) { log.error("Failed to clear all flows on switch " + this, e); }

Solution content

        try {
            List msglist = new ArrayList(1);
            msglist.add(fm);
            write(msglist);
            msglist = new ArrayList(1);
            msglist.add(barrierMsg);
            write(msglist);
        } catch (Exception e) {
            log.error("Failed to clear all flows on switch " + this, e);
        }

File
OFSwitchBase.java

Developer's decision
Version 1

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content
removeFromMaintenanceQueue(nptDst); // Consume this message <<<<<<< HEAD debugCounters.updateCounter("linkdiscovery-lldpeol"); ======= >>>>>>> d557724a9754431c4280f2c964647f6b75474891 return Command.STOP; }

Conflicting content

        removeFromMaintenanceQueue(nptDst);

        // Consume this message
<<<<<<< HEAD
        debugCounters.updateCounter("linkdiscovery-lldpeol");
=======
>>>>>>> d557724a9754431c4280f2c964647f6b75474891
        return Command.STOP;
    }

Solution content
removeFromMaintenanceQueue(nptDst); // Consume this message debugCounters.updateCounter("linkdiscovery-lldpeol"); return Command.STOP; }

File
LinkDiscoveryManager.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content
} debugCounters.registerCounter(getName() + "-" + "incoming", "All incoming packets seen by this module", CounterType.ALWAYS_COUNT); <<<<<<< HEAD debugCounters.registerCounter(getName() + "-" + "lldpeol", "End of Life for LLDP packets", CounterType.COUNT_ON_DEMAND); ======= >>>>>>> d557724a9754431c4280f2c964647f6b75474891 } // ****************************************************

Conflicting content

        }
        debugCounters.registerCounter(getName() + "-" + "incoming",
            "All incoming packets seen by this module", CounterType.ALWAYS_COUNT);
<<<<<<< HEAD
        debugCounters.registerCounter(getName() + "-" + "lldpeol",
            "End of Life for LLDP packets", CounterType.COUNT_ON_DEMAND);
=======
>>>>>>> d557724a9754431c4280f2c964647f6b75474891
    }

    // ****************************************************

Solution content
} debugCounters.registerCounter(getName() + "-" + "incoming", "All incoming packets seen by this module", CounterType.ALWAYS_COUNT); debugCounters.registerCounter(getName() + "-" + "lldpeol", "End of Life for LLDP packets", CounterType.COUNT_ON_DEMAND); } // ****************************************************

Solution content

        }
        debugCounters.registerCounter(getName() + "-" + "incoming",
            "All incoming packets seen by this module", CounterType.ALWAYS_COUNT);
        debugCounters.registerCounter(getName() + "-" + "lldpeol",
            "End of Life for LLDP packets", CounterType.COUNT_ON_DEMAND);
    }

    // ****************************************************

File
LinkDiscoveryManager.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Projects >> floodlight >>2685794519b66b49506b13dbda4b78c7163d0a66