| Chunk |
|---|
| Conflicting content |
|---|
ServerCursor cur;
try {
while ((cur = orphanedCursors.poll()) != null) {
<<<<<<< HEAD
ServerConnectionProviderOptions options = new ServerConnectionProviderOptions(false,
new ServerAddressSelector(cur.getAddress()));
ServerConnectionProvider provider = session.createServerConnectionProvider(options);
=======
ServerConnectionProvider provider = session.createServerConnectionProvider(new ServerConnectionProviderOptions(false,
new ServerAddressSelector(cur.getAddress())));
>>>>>>> 28f5c1141ca293fc312645fd185a13714f783d53
new KillCursorProtocol(new KillCursor(cur), getBufferProvider(), provider.getServerDescription(), provider.getConnection(),
true).execute();
|
| Solution content |
|---|
ServerCursor cur;
try {
while ((cur = orphanedCursors.poll()) != null) {
ServerConnectionProviderOptions options = new ServerConnectionProviderOptions(false,
new ServerAddressSelector(cur.getAddress()));
ServerConnectionProvider provider = session.createServerConnectionProvider(options);
new KillCursorProtocol(new KillCursor(cur), getBufferProvider(), provider.getServerDescription(), provider.getConnection(),
true).execute();
|
| File |
|---|
| Mongo.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |