Projects >> hudson >>b9f41f0b14bb16ba15b1302dcbb8eea68fca0308

Chunk
Conflicting content 
package hudson.remoting;

import java.io.OutputStream;
<<<<<<< HEAD
import java.util.logging.Level;
=======
>>>>>>> 156cb7d64152c5c6fb9bed3d480aa28185dbca8b
import java.util.logging.Logger;

import static java.util.logging.Level.*;
Solution content 
package hudson.remoting;

import java.io.OutputStream;
import java.util.logging.Logger;

import static java.util.logging.Level.*;
File
PipeWindow.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
        }

        public synchronized void increase(int delta) {
<<<<<<< HEAD
            if (LOGGER.isLoggable(INFO))
                LOGGER.info(String.format("increase(%d,%d)->%d",oid,delta,delta+available));
=======
            if (LOGGER.isLoggable(FINER))
                LOGGER.finer(String.format("increase(%d,%d)->%d",oid,delta,delta+available));
>>>>>>> 156cb7d64152c5c6fb9bed3d480aa28185dbca8b
            available += delta;
            acked += delta;
            notifyAll();
Solution content 
        }

        public synchronized void increase(int delta) {
            if (LOGGER.isLoggable(FINER))
                LOGGER.finer(String.format("increase(%d,%d)->%d",oid,delta,delta+available));
            available += delta;
            acked += delta;
            notifyAll();
File
PipeWindow.java
Developer's decision
Version 2
Kind of conflict
If statement
Chunk
Conflicting content 
        }

        public synchronized void decrease(int delta) {
<<<<<<< HEAD
            if (LOGGER.isLoggable(INFO))
                LOGGER.info(String.format("decrease(%d,%d)->%d",oid,delta,available-delta));
=======
            if (LOGGER.isLoggable(FINER))
                LOGGER.finer(String.format("decrease(%d,%d)->%d",oid,delta,available-delta));
>>>>>>> 156cb7d64152c5c6fb9bed3d480aa28185dbca8b
            available -= delta;
            written+= delta;
            if (available<0)
Solution content 
        }

        public synchronized void decrease(int delta) {
            if (LOGGER.isLoggable(FINER))
                LOGGER.finer(String.format("decrease(%d,%d)->%d",oid,delta,available-delta));
            available -= delta;
            written+= delta;
            if (available<0)
File
PipeWindow.java
Developer's decision
Version 2
Kind of conflict
If statement