1 files changed, 5 insertions, 5 deletions
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java
index 65c8a9df28e..6e416ce4906 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java
@@ -27,8 +27,8 @@ import com.yahoo.vespa.clustercontroller.core.ContentCluster;
 import com.yahoo.vespa.clustercontroller.core.MasterElectionHandler;
 import com.yahoo.vespa.clustercontroller.core.NodeInfo;
 import com.yahoo.vespa.clustercontroller.core.Timer;
-import com.yahoo.vespa.clustercontroller.core.listeners.NodeAddedOrRemovedListener;
-import com.yahoo.vespa.clustercontroller.core.listeners.NodeStateOrHostInfoChangeHandler;
+import com.yahoo.vespa.clustercontroller.core.listeners.SlobrokListener;
+import com.yahoo.vespa.clustercontroller.core.listeners.NodeListener;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -186,8 +186,8 @@ public class RpcServer {
     }
 
     public boolean handleRpcRequests(ContentCluster cluster, ClusterState systemState,
-                                     NodeStateOrHostInfoChangeHandler changeListener,
-                                     NodeAddedOrRemovedListener addedListener)
+                                     NodeListener changeListener,
+                                     SlobrokListener addedListener)
     {
         boolean handledAnyRequests = false;
         if (!isConnected()) {
@@ -234,7 +234,7 @@ public class RpcServer {
                     log.log(Level.FINE, "Resolving RPC getNodeList request");
                     List<String> slobrok = new ArrayList<String>();
                     List<String> rpc = new ArrayList<String>();
-                    for(NodeInfo node : cluster.getNodeInfo()) {
+                    for(NodeInfo node : cluster.getNodeInfos()) {
                         String s1 = node.getSlobrokAddress();
                         String s2 = node.getRpcAddress();
                         assert(s1 != null);