fixed bugs introduced by move to atomic reference.

Ryan · Ryan · commit 99cbea948574 · 2012-01-06T14:38:37.000-05:00
diff --git a/src/main/com/mongodb/ReplicaSetStatus.java b/src/main/com/mongodb/ReplicaSetStatus.java
@@ -81,7 +81,7 @@ public String getName() {
     @Override
 	public String toString() {
 	StringBuffer sb = new StringBuffer();
-	sb.append("{replSetName: '" + _setName );
+	sb.append("{replSetName: '" + _setName.get() );
 	sb.append("', closed:").append(_closed.get()).append(", ");
 	sb.append("nextResolveTime:'").append(new Date(_nextResolveTime).toString()).append("', ");
 	sb.append("members : [ ");
@@ -320,7 +320,7 @@ synchronized void update(Set<Node> seenNodes){
                     }
                 }
 
-                if (_isMaster ) {
+                if ( _isMaster ) {
                     // max size was added in 1.8
                     if (res.containsField("maxBsonObjectSize"))
                         _maxBsonObjectSize.set(((Integer)res.get( "maxBsonObjectSize" )).intValue());
@@ -330,12 +330,12 @@ synchronized void update(Set<Node> seenNodes){
 
                 if (res.containsField("setName")) {
 	                String setName = res.get( "setName" ).toString();
-	                if ( _setName == null ){
+	                if ( _setName.get() == null ){
 	                    _setName.set(setName);
 	                    _logger.set( Logger.getLogger( _rootLogger.getName() + "." + setName ) );
 	                }
-	                else if ( !_setName.equals( setName ) ){
-	                    _logger.get().log( Level.SEVERE , "mis match set name old: " + _setName.get() + " new: " + setName );
+	                else if ( !_setName.get().equals( setName ) ){
+	                    _logger.get().log( Level.SEVERE , "mismatch set name old: " + _setName.get() + " new: " + setName );
 	                    return;
 	                }
                 }
@@ -345,7 +345,7 @@ else if ( !_setName.equals( setName ) ){
                 if (_ok == true) {
                     _logger.get().log( Level.WARNING , "Server seen down: " + _addr, e );
                 } else if (Math.random() < 0.1) {
-                    _logger.get().log( Level.WARNING , "Server seen down: " + _addr );
+                    _logger.get().log( Level.WARNING , "Server seen down: " + _addr, e );
                 }
                 _ok = false;
             }
@@ -484,7 +484,7 @@ Node ensureMaster(){
                 return n;
         }
 
-        if ( _lastPrimarySignal != null ){
+        if ( _lastPrimarySignal.get() != null ){
             n = findNode( _lastPrimarySignal.get() );
             if (n != null) {
                 n.update();
