| Chunk |
|---|
| Conflicting content |
|---|
private transient Session session; private boolean hasFailures = false; <<<<<<< HEAD public Serializable recoveryMutex = "RECOVERY_MUTEX"; ======= private Object recoveryMutex = new Object(); >>>>>>> 4fcddeac4cf7056ff4a95122a965c0fa2fb02cae private Timer recoveryTimer = null; private long recoveryPeriod = -1; // default to disabled |
| Solution content |
|---|
private transient Session session; private boolean hasFailures = false; public final Serializable recoveryMutex = "RECOVERY_MUTEX"; private Timer recoveryTimer = null; private long recoveryPeriod = -1; // default to disabled |
| File |
|---|
| JmsSpout.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |