Projects >> h-store >>81ff8f29b6f0db740f841f9b21a50e6df98ef427

Chunk
Conflicting content 
        t = trace.get();
    }
    
<<<<<<< HEAD
    @Override
    public long getInstanceId() {
        return (this.instanceId);
    }
    protected void setInstanceId(long instanceId) {
        if (d) LOG.debug("Setting Cluster InstanceId: " + instanceId);
        this.instanceId = instanceId;
=======
    public DBBPool getBufferPool() {
        return (this.buffer_pool);
>>>>>>> 715508f981d81d92389152699272b8b134faac3a
    }
    
    /**
Solution content 
        t = trace.get();
    }
    
    @Override
    public long getInstanceId() {
        return (this.instanceId);
    }
    protected void setInstanceId(long instanceId) {
        if (d) LOG.debug("Setting Cluster InstanceId: " + instanceId);
        this.instanceId = instanceId;
    }
    public DBBPool getBufferPool() {
        return (this.buffer_pool);
    }
    
    /**
File
HStoreSite.java
Developer's decision
Concatenation
Kind of conflict
Annotation
Attribute
If statement
Method declaration
Method signature
Return statement