JAVA-1161: Just to be safe, also ignoring replica set members without a setName.

Author: jyemin

src/main/com/mongodb/MultiServerCluster.java

@@ -152,7 +152,7 @@ private void handleReplicaSetMemberChanged(final ServerDescription newDescriptio
             return;
         }
 
-        if (newDescription.getHosts().isEmpty()) {
+        if (newDescription.getHosts().isEmpty() || newDescription.getSetName() == null) {
             LOGGER.info(format("Server %s does not appear to be a member of an initiated replica set.", newDescription.getAddress()));
             return;
         }
@@ -161,7 +161,7 @@ private void handleReplicaSetMemberChanged(final ServerDescription newDescriptio
             replicaSetName = newDescription.getSetName();
         }
 
-        if (replicaSetName != null && !replicaSetName.equals(newDescription.getSetName())) {
+        if (!replicaSetName.equals(newDescription.getSetName())) {
             LOGGER.severe(format("Expecting replica set member from set '%s', but found one from set '%s'.  "
                                  + "Removing %s from client view of cluster.",
                                  replicaSetName, newDescription.getSetName(), newDescription.getAddress()));

src/test/com/mongodb/MultiServerClusterSpecification.groovy

@@ -120,7 +120,21 @@ class MultiServerClusterSpecification extends Specification {
                 CLUSTER_LISTENER)
 
         when:
-        sendNotification(secondServer, ReplicaSetOther, [], null)  // null replica set name
+        sendNotification(secondServer, ReplicaSetOther, [])
+
+        then:
+        getClusterDescription(cluster).type == ReplicaSet
+        getClusterDescription(cluster).all == getServerDescriptions(firstServer, secondServer)
+    }
+
+    def 'should ignore a host without a replica set name when type is replica set'() {
+        given:
+        def cluster = new MultiServerCluster(
+                CLUSTER_ID, ClusterSettings.builder().requiredClusterType(ReplicaSet).hosts([firstServer, secondServer]).build(), factory,
+                CLUSTER_LISTENER)
+
+        when:
+        sendNotification(secondServer, ReplicaSetOther, [firstServer, secondServer], null)  // null replica set name
 
         then:
         getClusterDescription(cluster).type == ReplicaSet
@@ -322,7 +336,7 @@ class MultiServerClusterSpecification extends Specification {
     }
 
     def sendNotification(ServerAddress serverAddress, ServerType serverType, List<ServerAddress> hosts) {
-        sendNotification(serverAddress, serverType, hosts, null)
+        sendNotification(serverAddress, serverType, hosts, 'test')
     }
 
     def sendNotification(ServerAddress serverAddress, ServerType serverType, List<ServerAddress> hosts, String setName, int setVersion) {