| Chunk |
|---|
| Conflicting content |
|---|
if (isLogAbandoned()) {
StringBuilder buf = new StringBuilder();
<<<<<<< HEAD
buf.append("abandon connection, owner thread: ");
buf.append(pooledConnection.getOwnerThread().getName());
buf.append(", connected at : ");
buf.append(pooledConnection.getConnectedTimeMillis());
buf.append(", open stackTrace\n");
=======
buf.append("abandon connection, open stackTrace\n");
buf.append("ownerThread " + pooledConnection.getOwnerThread() + " getConnect at " + connectedTimeFormate.format(new Date(pooledConnection.getConnectedTime())) + "\n");
>>>>>>> 888bdb059f151c185832c5eae667723dfc26a81c
StackTraceElement[] trace = pooledConnection.getConnectStackTrace();
for (int i = 0; i < trace.length; i++) { |
| Solution content |
|---|
if (isLogAbandoned()) {
StringBuilder buf = new StringBuilder();
buf.append("abandon connection, owner thread: ");
buf.append(pooledConnection.getOwnerThread().getName());
buf.append(", connected at : ");
buf.append(pooledConnection.getConnectedTimeMillis());
buf.append(", open stackTrace\n");
StackTraceElement[] trace = pooledConnection.getConnectStackTrace();
for (int i = 0; i < trace.length; i++) { |
| File |
|---|
| DruidDataSource.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
private boolean disable = false;
private boolean closed = false;
private final Thread ownerThread;
<<<<<<< HEAD
private long connectedTimeMillis;
=======
private long connectedTime = 0;
>>>>>>> 888bdb059f151c185832c5eae667723dfc26a81c
private long connectedTimeNano;
private volatile boolean running = false;
|
| Solution content |
|---|
private boolean disable = false;
private boolean closed = false;
private final Thread ownerThread;
private long connectedTimeMillis;
private long connectedTimeNano;
private volatile boolean running = false;
|
| File |
|---|
| DruidPooledConnection.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |