Projects >> helix >>cc028fd8e87ef8cb5566c0d93ade423385726220

Chunk
Conflicting content
    String dbIdealStatePath = idealStatePath + "/" + dbName;
    if (_zkClient.exists(dbIdealStatePath))
    {
<<<<<<< HEAD
      throw new HelixException("Skip the operation. Resource " + dbName
          + " already exists:" + dbIdealStatePath);
=======
      throw new HelixException("Skip the operation. DB ideal state directory exists:"
          + dbIdealStatePath);
>>>>>>> bdae2a526cc83900723fd3ed4585f8a0342d0aed
    }

    ZKUtil.createChildren(_zkClient, idealStatePath, idealState.getRecord());
Solution content
    String dbIdealStatePath = idealStatePath + "/" + dbName;
    if (_zkClient.exists(dbIdealStatePath))
    {
      throw new HelixException("Skip the operation. DB ideal state directory exists:"
          + dbIdealStatePath);
    }

    ZKUtil.createChildren(_zkClient, idealStatePath, idealState.getRecord());
File
ZKHelixAdmin.java
Developer's decision
Version 2
Kind of conflict
Throw statement