Projects >> druid >>166a486bc8805f341f8b9d27889697ecdd9d85fc

Chunk
Conflicting content 
        value.setTestWhileIdle(this.isTestWhileIdle());

        value.setDefaultAutoCommit(this.isDefaultAutoCommit());
<<<<<<< HEAD
        if (defaultReadOnly != null) {
            value.setDefaultReadOnly(defaultReadOnly);
=======
        if (getDefaultReadOnly() != null) {
            value.setDefaultReadOnly(this.getDefaultReadOnly());
>>>>>>> ef999c6b4d223ab426a0d51869965211dc803b0a
        }
        value.setDefaultTransactionIsolation(this.getDefaultTransactionIsolation());
Solution content 
        value.setTestWhileIdle(this.isTestWhileIdle());

        value.setDefaultAutoCommit(this.isDefaultAutoCommit());

        if (defaultReadOnly != null) {
            value.setDefaultReadOnly(defaultReadOnly);
        }
        value.setDefaultTransactionIsolation(this.getDefaultTransactionIsolation());
File
DruidDataSource.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation