Projects >> cloudname >>c4e5ad098873e538394c95d5a9cef565213ed37f

Chunk
Conflicting content
        // blindly, meaning that if the path already exists, then
        // that's ok -- so a more correct name for this method would
        // be ensureCoordinate(), but that might confuse developers.
<<<<<<< HEAD
        String root = ZkCoordinatePath.getCoordinateRoot(coordinate);
=======
        String root = ZkCoordinatePath.getRoot(coordinate);
        if (Util.exist(zk, root)) {
            throw new CloudnameException.CoordinateExist();
        }
>>>>>>> e365861c11257924c76a1cd7838bccfb1dc828f6
        try {
            Util.mkdir(zk, root, Ids.OPEN_ACL_UNSAFE);
        } catch (KeeperException e) {
Solution content
        // blindly, meaning that if the path already exists, then
        // that's ok -- so a more correct name for this method would
        // be ensureCoordinate(), but that might confuse developers.
        String root = ZkCoordinatePath.getCoordinateRoot(coordinate);

        if (Util.exist(zk, root)) {
            throw new CloudnameException.CoordinateExist();
        }

        try {
            Util.mkdir(zk, root, Ids.OPEN_ACL_UNSAFE);
        } catch (KeeperException e) {
File
ZkCloudname.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Variable