Projects >> jdbi >>25f36eafcfd9ab687d6e2b9816f498677580d2a3

Chunk
Conflicting content 
        @Override
        protected Object result(ResultBearing q, final HandleDing baton)
        {
<<<<<<< HEAD:sqlobject/src/main/java/org/jdbi/v3/sqlobject/ResultReturnThing.java
            final ResultIterator itty = q.iterator();
            baton.retain("iterator");
=======
            final ResultIterator itty = q.iterator();

            final boolean isEmpty = !itty.hasNext();
            if (isEmpty) {
                itty.close();
            } else {
                baton.retain("iterator");
            }
>>>>>>> f9605849cd227bff74ee75e0bc5635aad1ff663d:src/main/java/org/skife/jdbi/v2/sqlobject/ResultReturnThing.java

            return new ResultIterator()
            {
Solution content 
        @Override
        protected Object result(ResultBearing q, final HandleDing baton)
        {
            final ResultIterator itty = q.iterator();

            final boolean isEmpty = !itty.hasNext();
            if (isEmpty) {
                itty.close();
            } else {
                baton.retain("iterator");
            }

            return new ResultIterator()
            {
File
ResultReturnThing.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Variable