Projects >> accumulo >>46e5d5c8d14c6fcacad5c15c71f5921d8333bd85

Chunk
Conflicting content
  private HostAndPort startTabletClientService() throws UnknownHostException {
    // start listening for client connection last
<<<<<<< HEAD
    clientHandler = new ThriftClientHandler();
    Iface rpcProxy = RpcWrapper.service(clientHandler, new Processor(clientHandler).getProcessMapView());
=======
    ThriftClientHandler handler = new ThriftClientHandler();
    Iface rpcProxy = RpcWrapper.service(handler, new Processor(handler));
>>>>>>> 0e3af1e8560b0a28a4415f8da38a561965d552dc
    final Processor processor;
    if (ThriftServerType.SASL == getThriftServerType()) {
      Iface tcredProxy = TCredentialsUpdatingWrapper.service(rpcProxy, ThriftClientHandler.class, getConfiguration());
Solution content
  private HostAndPort startTabletClientService() throws UnknownHostException {
    // start listening for client connection last
    clientHandler = new ThriftClientHandler();
    Iface rpcProxy = RpcWrapper.service(clientHandler, new Processor(clientHandler));
    final Processor processor;
    if (ThriftServerType.SASL == getThriftServerType()) {
      Iface tcredProxy = TCredentialsUpdatingWrapper.service(rpcProxy, ThriftClientHandler.class, getConfiguration());
File
TabletServer.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation
Variable