Projects >> accumulo >>ae4653287f8e2e20e48e3b43ca3f3bec84d82d9a

Chunk
Conflicting content 
    
    List args = Arrays.asList(ByteBuffer.wrap(srcTableId.getBytes()), ByteBuffer.wrap(newTableName.getBytes()));
    Map opts = new HashMap();
<<<<<<< HEAD
    opts.putAll(propertiesToSet);
    for (String prop : propertiesToExclude)
      opts.put(prop, "");
=======
    for (Entry entry : propertiesToSet.entrySet()) {
      if (entry.getKey().startsWith(CLONE_EXCLUDE_PREFIX))
        throw new IllegalArgumentException("Property can not start with " + CLONE_EXCLUDE_PREFIX);
      opts.put(entry.getKey(), entry.getValue());
    }
    
    for (String prop : propertiesToExclude) {
      opts.put(CLONE_EXCLUDE_PREFIX + prop, "");
    }
>>>>>>> 8622b4d670ecb3fde53022cb6588df649357d2c9
    
    doTableOperation(TableOperation.CLONE, args, opts);
  }
Solution content 
    
    List args = Arrays.asList(ByteBuffer.wrap(srcTableId.getBytes()), ByteBuffer.wrap(newTableName.getBytes()));
    Map opts = new HashMap();
    for (Entry entry : propertiesToSet.entrySet()) {
      if (entry.getKey().startsWith(CLONE_EXCLUDE_PREFIX))
        throw new IllegalArgumentException("Property can not start with " + CLONE_EXCLUDE_PREFIX);
      opts.put(entry.getKey(), entry.getValue());
    }
    
    for (String prop : propertiesToExclude) {
      opts.put(CLONE_EXCLUDE_PREFIX + prop, "");
    }
    
    doTableOperation(TableOperation.CLONE, args, opts);
  }
File
TableOperationsImpl.java
Developer's decision
Version 2
Kind of conflict
For statement
Method invocation
Chunk
Conflicting content 
          Set propertiesToExclude = new HashSet();
          
          for (Entry entry : options.entrySet()) {
<<<<<<< HEAD
            if (entry.getValue() == null || entry.getValue().isEmpty()) {
              propertiesToExclude.add(entry.getKey());
=======
            if (entry.getKey().startsWith(TableOperationsImpl.CLONE_EXCLUDE_PREFIX)) {
              propertiesToExclude.add(entry.getKey().substring(TableOperationsImpl.CLONE_EXCLUDE_PREFIX.length()));
>>>>>>> 8622b4d670ecb3fde53022cb6588df649357d2c9
              continue;
            }
Solution content 
          Set propertiesToExclude = new HashSet();
          
          for (Entry entry : options.entrySet()) {
            if (entry.getKey().startsWith(TableOperationsImpl.CLONE_EXCLUDE_PREFIX)) {
              propertiesToExclude.add(entry.getKey().substring(TableOperationsImpl.CLONE_EXCLUDE_PREFIX.length()));
              continue;
            }
File
Master.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation