Projects >> h-store >>526ee2fa6aa5a7f1db91f0d8010b4bae49bb39f0

Chunk
Conflicting content 
    public void syncClusterTimes() {
        // We don't need to do this if there is only one site
        if (this.num_sites == 1) return;
<<<<<<< HEAD
        final CountDownLatch latch = new CountDownLatch(this.num_sites);
=======
        
        final CountDownLatch latch = new CountDownLatch(this.num_sites-1);
>>>>>>> a3dd12fc25542886d6654a70cc7b839a57f500eb
        final Map time_deltas = Collections.synchronizedMap(new HashMap());
        
        RpcCallback callback = new RpcCallback() {
Solution content 
    public void syncClusterTimes() {
        // We don't need to do this if there is only one site
        if (this.num_sites == 1) return;
        final CountDownLatch latch = new CountDownLatch(this.num_sites-1);
        final Map time_deltas = Collections.synchronizedMap(new HashMap());
        
        RpcCallback callback = new RpcCallback() {
File
HStoreCoordinator.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable