Projects >> accumulo >>f478737a13a76ec1ec3c96f160c101f50ba04f03

Chunk
Conflicting content 
    try {
      // Read the gc location from its lock
      ZooReaderWriter zk = ZooReaderWriter.getInstance();
<<<<<<< HEAD:server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
=======

>>>>>>> f896c9566c9a483bcf7d074efce16b1f1c88ed2c:server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
      String path = ZooUtil.getRoot(instance) + Constants.ZGC_LOCK;
      List locks = zk.getChildren(path, null);
      if (locks != null && locks.size() > 0) {
Solution content 
    try {
      // Read the gc location from its lock
      ZooReaderWriter zk = ZooReaderWriter.getInstance();
      String path = ZooUtil.getRoot(instance) + Constants.ZGC_LOCK;
      List locks = zk.getChildren(path, null);
      if (locks != null && locks.size() > 0) {
File
Monitor.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
        address = new ServerServices(new String(zk.getData(path + "/" + locks.get(0), null))).getAddress(Service.GC_CLIENT);
        GCMonitorService.Client client = ThriftUtil.getClient(new GCMonitorService.Client.Factory(), address, config.getConfiguration());
        try {
<<<<<<< HEAD:server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
          result = client.getStatus(Tracer.traceInfo(), SystemCredentials.get().toThrift(instance));
=======
          result = client.getStatus(Tracer.traceInfo(), SecurityConstants.getSystemCredentials());
>>>>>>> f896c9566c9a483bcf7d074efce16b1f1c88ed2c:server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
        } finally {
          ThriftUtil.returnClient(client);
        }
Solution content 
        address = new ServerServices(new String(zk.getData(path + "/" + locks.get(0), null))).getAddress(Service.GC_CLIENT);
        GCMonitorService.Client client = ThriftUtil.getClient(new GCMonitorService.Client.Factory(), address, config.getConfiguration());
        try {
          result = client.getStatus(Tracer.traceInfo(), SystemCredentials.get().toThrift(instance));
        } finally {
          ThriftUtil.returnClient(client);
        }
File
Monitor.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable