Skip to content

Commit e950bbe

Browse files
committed
For final release, updating server version checks from 2.5.x dev releases to 2.6 release.
1 parent a3a90b4 commit e950bbe

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

src/main/com/mongodb/DBApiLayer.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
import java.util.concurrent.ConcurrentLinkedQueue;
2626
import java.util.logging.Level;
2727

28-
import static java.util.Arrays.asList;
29-
3028
/**
3129
* Concrete extension of abstract {@code DB} class.
3230
*
@@ -198,7 +196,7 @@ CommandResult doAuthenticate(MongoCredential credentials) {
198196
}
199197

200198
private boolean useUserCommands(final DBPort port) {
201-
return _connector.getServerDescription(port.getAddress()).getVersion().compareTo(new ServerVersion(asList(2, 5, 4))) >= 0;
199+
return _connector.getServerDescription(port.getAddress()).getVersion().compareTo(new ServerVersion(2, 6)) >= 0;
202200
}
203201

204202
void addDeadCursor(final DeadCursor deadCursor) {

src/main/com/mongodb/DBCollectionImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ public void createIndex(final DBObject keys, final DBObject options, DBEncoder e
335335
index.putAll(options);
336336
index.put("key", keys);
337337

338-
if (connector.getServerDescription(port.getAddress()).getVersion().compareTo(new ServerVersion(asList(2, 5, 5))) >= 0) {
338+
if (connector.getServerDescription(port.getAddress()).getVersion().compareTo(new ServerVersion(2, 6)) >= 0) {
339339
BasicDBObject createIndexes = new BasicDBObject("createIndexes", getName());
340340

341341
BasicDBList list = new BasicDBList();
@@ -435,7 +435,7 @@ private BulkWriteResult writeWithCommandProtocol(final DBPort port, final WriteR
435435

436436
private boolean useWriteCommands(final WriteConcern concern, final DBPort port) {
437437
return concern.callGetLastError() &&
438-
db.getConnector().getServerDescription(port.getAddress()).getVersion().compareTo(new ServerVersion(asList(2, 5, 5))) >= 0;
438+
db.getConnector().getServerDescription(port.getAddress()).getVersion().compareTo(new ServerVersion(2, 6)) >= 0;
439439
}
440440

441441
private MessageSettings getMessageSettings(final ServerAddress address) {

src/main/com/mongodb/ServerVersion.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
package com.mongodb;
1818

1919
import java.util.ArrayList;
20-
import java.util.Arrays;
2120
import java.util.Collections;
2221
import java.util.List;
2322

23+
import static java.util.Arrays.asList;
2424
import static org.bson.util.Assertions.isTrue;
2525
import static org.bson.util.Assertions.notNull;
2626

@@ -34,7 +34,7 @@ class ServerVersion implements Comparable<ServerVersion> {
3434
* Creates a server version which will compare as less than all other valid versions
3535
*/
3636
public ServerVersion() {
37-
this.versionList = Collections.unmodifiableList(Arrays.asList(0, 0, 0));
37+
this.versionList = Collections.unmodifiableList(asList(0, 0, 0));
3838
}
3939

4040
/**
@@ -48,6 +48,16 @@ public ServerVersion(final List<Integer> versionList) {
4848
this.versionList = Collections.unmodifiableList(new ArrayList<Integer>(versionList));
4949
}
5050

51+
/**
52+
* Constructs a new instance with the given major and minor versions and a patch version of 0.
53+
*
54+
* @param majorVersion the major version
55+
* @param minorVersion the minor version
56+
*/
57+
public ServerVersion(final int majorVersion, final int minorVersion) {
58+
this(asList(majorVersion, minorVersion, 0));
59+
}
60+
5161
/**
5262
* Gets the version list.
5363
*

0 commit comments

Comments
 (0)