From ae8791a096626b0196c63e4d9cb68f7a18ad86b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kjetil.orbekk@gmail.com>
Date: Tue, 24 Apr 2012 12:41:25 +0200
Subject: Switch to protobuf based Paxos in functional test.

---
 same/src/main/java/com/orbekk/paxos/MasterProposer.java | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'same/src/main/java/com/orbekk/paxos/MasterProposer.java')

diff --git a/same/src/main/java/com/orbekk/paxos/MasterProposer.java b/same/src/main/java/com/orbekk/paxos/MasterProposer.java
index 9b74532..dbfd3c1 100644
--- a/same/src/main/java/com/orbekk/paxos/MasterProposer.java
+++ b/same/src/main/java/com/orbekk/paxos/MasterProposer.java
@@ -10,6 +10,7 @@ import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.junit.runner.Request;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -92,6 +93,10 @@ public class MasterProposer extends Thread {
         for (String location : paxosLocations) {
             Rpc rpc = new Rpc();
             Services.Paxos paxos = connections.getPaxos0(location);
+            if (paxos == null) {
+                handler.run(null);
+                continue;
+            }
             PaxosRequest request = PaxosRequest.newBuilder()
                     .setClient(client)
                     .setProposalNumber(proposalNumber)
-- 
cgit v1.2.3