[JAVA-263]: NullPointerException due to race condition during concurrent access to DBTCPTransport

agirbal · agirbal · commit b0e163ea0205 · 2011-02-07T16:19:34.000-08:00
diff --git a/src/main/com/mongodb/DBTCPConnector.java b/src/main/com/mongodb/DBTCPConnector.java
@@ -403,8 +403,8 @@ void testMaster()
         }
     }
 
-    private boolean _set( ServerAddress addr ){
-        if ( _curMaster == addr )
+    private synchronized boolean _set( ServerAddress addr ){
+        if ( _curMaster == addr && _masterPortPool != null )
             return false;
         _curMaster = addr;
         _masterPortPool = _portHolder.get( addr );

Original file line number	Diff line number	Diff line change
`@@ -403,8 +403,8 @@ void testMaster()`
`403`	`403`	`}`
`404`	`404`	`}`
`405`	`405`
`406`		`- private boolean _set( ServerAddress addr ){`
`407`		`- if ( _curMaster == addr )`
	`406`	`+ private synchronized boolean _set( ServerAddress addr ){`
	`407`	`+ if ( _curMaster == addr && _masterPortPool != null )`
`408`	`408`	`return false;`
`409`	`409`	`_curMaster = addr;`
`410`	`410`	`_masterPortPool = _portHolder.get( addr );`