Fix NPE.

tree33333 · May 6, 2011 · f7c69bf · f7c69bf
1 parent 19bfb76
commit f7c69bf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/src/main/java/com/sensei/search/cluster/client/SenseiNetworkClient.java b/src/main/java/com/sensei/search/cluster/client/SenseiNetworkClient.java
@@ -11,6 +11,7 @@
 import com.linkedin.norbert.cluster.InvalidClusterException;
 import com.linkedin.norbert.cluster.InvalidNodeException;
 import com.linkedin.norbert.javacompat.cluster.Node;
+import com.linkedin.norbert.javacompat.network.IntegerConsistentHashPartitionedLoadBalancerFactory;
 import com.linkedin.norbert.javacompat.network.NettyPartitionedNetworkClient;
 import com.linkedin.norbert.javacompat.network.NetworkClientConfig;
 import com.linkedin.norbert.javacompat.network.PartitionedLoadBalancer;
@@ -19,7 +20,6 @@
 import com.linkedin.norbert.javacompat.network.ScatterGatherHandler;
 import com.linkedin.norbert.network.NoNodesAvailableException;
 import com.linkedin.norbert.network.ResponseIterator;
-import com.sensei.search.cluster.routing.UniformPartitionedRoutingFactory;
 
 /**
  * @author nnarkhed
@@ -37,13 +37,7 @@ public SenseiNetworkClient(NetworkClientConfig netConfig, PartitionedLoadBalance
     }
     else
     {
-      _networkClient = new NettyPartitionedNetworkClient<Integer>(netConfig, new PartitionedLoadBalancerFactory<Integer>()
-                            {
-                              public PartitionedLoadBalancer<Integer> newLoadBalancer(Set<Node> nodes)
-                              {
-                                throw new UnsupportedOperationException();
-                              }
-                            });
+      _networkClient = new NettyPartitionedNetworkClient<Integer>(netConfig, new IntegerConsistentHashPartitionedLoadBalancerFactory());
     }
   }
 

diff --git a/src/main/java/com/sensei/search/nodes/AbstractConsistentHashBroker.java b/src/main/java/com/sensei/search/nodes/AbstractConsistentHashBroker.java
@@ -35,7 +35,6 @@ public abstract class AbstractConsistentHashBroker<REQUEST extends AbstractSense
   private final static Logger logger = Logger.getLogger(AbstractConsistentHashBroker.class);
   protected long _timeout = 8000;
   protected SenseiLoadBalancer _loadBalancer;
-  protected final SenseiLoadBalancerFactory _loadBalancerFactory;
 
   /**
    * @param networkClient
@@ -53,8 +52,7 @@ public abstract class AbstractConsistentHashBroker<REQUEST extends AbstractSense
   public AbstractConsistentHashBroker(PartitionedNetworkClient<Integer> networkClient, ClusterClient clusterClient, REQMSG defaultrequest, RESMSG defaultresult, SenseiLoadBalancerFactory loadBalancerFactory)
       throws NorbertException
   {
-    super(networkClient, clusterClient, defaultrequest, defaultresult,null);
-    _loadBalancerFactory = loadBalancerFactory;
+    super(networkClient, clusterClient, defaultrequest, defaultresult, loadBalancerFactory);
   }
 
   public abstract REQMSG requestToMessage(REQUEST request);

diff --git a/src/main/java/com/sensei/search/nodes/AbstractSenseiBroker.java b/src/main/java/com/sensei/search/nodes/AbstractSenseiBroker.java
@@ -8,8 +8,8 @@
 import com.linkedin.norbert.NorbertException;
 import com.linkedin.norbert.javacompat.cluster.ClusterClient;
 import com.linkedin.norbert.javacompat.cluster.ClusterListener;
-import com.linkedin.norbert.javacompat.network.PartitionedLoadBalancerFactory;
 import com.linkedin.norbert.javacompat.network.PartitionedNetworkClient;
+import com.sensei.search.cluster.routing.SenseiLoadBalancerFactory;
 import com.sensei.search.req.AbstractSenseiRequest;
 import com.sensei.search.req.AbstractSenseiResult;
 import com.sensei.search.svc.api.SenseiException;
@@ -28,7 +28,7 @@ public abstract class AbstractSenseiBroker<REQUEST extends AbstractSenseiRequest
   private final static Logger logger = Logger.getLogger(AbstractSenseiBroker.class);
   protected final PartitionedNetworkClient<Integer> _networkClient;
   protected final ClusterClient _clusterClient;
-  protected final PartitionedLoadBalancerFactory<Integer> _routerFactory;
+  protected final SenseiLoadBalancerFactory _loadBalancerFactory;
   protected volatile IntSet _partitions = null;
 
 
@@ -46,10 +46,10 @@ public abstract class AbstractSenseiBroker<REQUEST extends AbstractSenseiRequest
    * @throws NorbertException
    */
   public AbstractSenseiBroker(PartitionedNetworkClient<Integer> networkClient, ClusterClient clusterClient, 
-		  	REQMSG defaultrequest, RESMSG defaultresult,PartitionedLoadBalancerFactory<Integer> routerFactory)
+		  	REQMSG defaultrequest, RESMSG defaultresult, SenseiLoadBalancerFactory loadBalancerFactory)
       throws NorbertException
   {
-	_routerFactory = routerFactory;
+	  _loadBalancerFactory = loadBalancerFactory;
     _networkClient = networkClient;
     _clusterClient = clusterClient;
     // register the request-response messages