Projects >> bitronix-hp >>38a0a4031303cc229f63e34efe9953744454caf0

Chunk
Conflicting content 
        connection1.createStatement();

        Connection connection2 = poolingDataSource2.getConnection();
<<<<<<< HEAD
        JdbcConnectionHandle handle = (JdbcConnectionHandle) connection1;
=======
        JdbcConnectionHandle handle = (JdbcConnectionHandle) Proxy.getInvocationHandler(connection2);
>>>>>>> ef7eb677c3151ab64ab7d9f27c6cb4260261b87c
        XAConnection xaConnection2 = (XAConnection) AbstractMockJdbcTest.getWrappedXAConnectionOf(handle.getPooledConnection());
        connection2.createStatement();
Solution content 
        connection1.createStatement();

        Connection connection2 = poolingDataSource2.getConnection();
        JdbcConnectionHandle handle = (JdbcConnectionHandle) connection2;
        XAConnection xaConnection2 = (XAConnection) AbstractMockJdbcTest.getWrappedXAConnectionOf(handle.getPooledConnection());
        connection2.createStatement();
File
Phase2FailureTest.java
Developer's decision
Manual
Kind of conflict
Cast expression
Variable