Projects >> helix >>2165a81ce42382c86c9c50e59bad8c2c2dc672bb

Chunk
Conflicting content 
    _zkClient = zkClient;
  }

<<<<<<< HEAD
  boolean checkPath(String path)
  {
    return true;// path.equals("/" + _root) || path.startsWith("/" + _root +
                // "/");
  }

  @Override
  public boolean create(String path, ZNRecord record, int options)
  {
    if (!checkPath(path))
    {
      LOG.error("invalid path. path: " + path);
      return false;
    }

=======
  @Override
  public boolean create(String path, ZNRecord record, int options)
  {
>>>>>>> 85d68b383e7e27f08fc04fe0584c5ac9ddb6482b
    CreateMode mode = Option.getMode(options);
    if (mode == null)
    {
Solution content 

    _zkClient = zkClient;
  }
  @Override
  public boolean create(String path, ZNRecord record, int options)
  {
    CreateMode mode = Option.getMode(options);
    if (mode == null)
    {
File
ZkBaseDataAccessor.java
Developer's decision
Version 2
Kind of conflict
Annotation
If statement
Method declaration
Method signature
Chunk
Conflicting content 
        String path = parentPath + "/" + childName;
        paths.add(path);
      }
<<<<<<< HEAD
      return get(paths, options);
    } catch (ZkNoNodeException e)
=======
      
      // remove null children
      List records = get(paths, options);
      Iterator iter = records.iterator();
      while (iter.hasNext())
      {
        if (iter.next() == null)
        {
          iter.remove();
        }
      }
      return records;
    }
    catch (ZkNoNodeException e)
>>>>>>> 85d68b383e7e27f08fc04fe0584c5ac9ddb6482b
    {
      return Collections.emptyList();
    }
Solution content 
        String path = parentPath + "/" + childName;
        paths.add(path);
      }
//remove null children
List records = get(paths, options);
Iterator iter = records.iterator();
while (iter.hasNext())
{
  if (iter.next() == null)
  {
    iter.remove();
  }
}
return records;
}
      
      
    catch (ZkNoNodeException e)
    {
      return Collections.emptyList();
    }
File
ZkBaseDataAccessor.java
Developer's decision
Version 2
Kind of conflict
Catch clause
Comment
Method invocation
Return statement
Variable
While statement