Projects >> opentsdb >>5750a26ae45fdb0e8be37ddb19b5fda789072245

Chunk
Conflicting content 
      class ErrBack implements Callback {
        public Object call(final Exception e) throws Exception {
          assignment.callback(e);
<<<<<<< HEAD
          synchronized(pending_assignments) {
            if (pending_assignments.containsKey(name)) {
              pending_assignments.remove(name);
              LOG.warn("Failed pending assignment for: " + name);
            }
          }
=======
          LOG.warn("Failed pending assignment for: " + name);
>>>>>>> 91e45187e9888d2755e9adaee428a2a9d4cc94b2
          return assignment;
        }
      }
Solution content 
      class ErrBack implements Callback {
        public Object call(final Exception e) throws Exception {
          assignment.callback(e);
          LOG.warn("Failed pending assignment for: " + name);
          return assignment;
        }
      }
File
UniqueId.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Synchronized statement
TypeDeclarationStatement
Chunk
Conflicting content 
        class GetIdCB implements Callback {
          public Object call(final byte[] row) throws Exception {
            assignment.callback(row);
<<<<<<< HEAD
            synchronized(pending_assignments) {
              if (pending_assignments.containsKey(name)) {
                pending_assignments.remove(name);
                LOG.info("Completed pending assignment for: " + name);
              }
            }
            return assignment;
=======
            return null;
>>>>>>> 91e45187e9888d2755e9adaee428a2a9d4cc94b2
          }
        }
        getIdAsync(name).addCallback(new GetIdCB());
Solution content 
        class GetIdCB implements Callback {
          public Object call(final byte[] row) throws Exception {
            assignment.callback(row);
            return null;
          }
        }
        getIdAsync(name).addCallback(new GetIdCB());
File
UniqueId.java
Developer's decision
Version 2
Kind of conflict
Return statement
Synchronized statement
TypeDeclarationStatement