Fixed two NPEs.

apache · Dec 5, 2014 · 9076b4a · 9076b4a
1 parent 3e1306c
commit 9076b4a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/network/common/src/main/java/org/apache/spark/network/client/TransportClientFactory.java b/network/common/src/main/java/org/apache/spark/network/client/TransportClientFactory.java
@@ -66,6 +66,9 @@ private class ClientPool {
     public ClientPool() {
       clients = new TransportClient[numConnectionsPerPeer];
       locks = new Object[numConnectionsPerPeer];
+      for (int i = 0; i < numConnectionsPerPeer; i++) {
+        locks[i] = new Object();
+      }
     }
   }
 
@@ -120,7 +123,8 @@ public TransportClient createClient(String remoteHost, int remotePort) throws IO
     // Create the ClientPool if we don't have it yet.
     ClientPool clientPool = connectionPool.get(address);
     if (clientPool == null) {
-      clientPool = connectionPool.putIfAbsent(address, new ClientPool());
+      connectionPool.putIfAbsent(address, new ClientPool());
+      clientPool = connectionPool.get(address);
     }
 
     int clientIndex = rand.nextInt(numConnectionsPerPeer);