From 263f3a0b4425287ef234d0dbf039e0027c4ad6c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kjetil.orbekk@gmail.com>
Date: Tue, 24 Jan 2012 11:11:45 +0100
Subject: Paxos: Remove roundId parameter.

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

(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 3a451d0..912de7e 100644
--- a/same/src/main/java/com/orbekk/paxos/MasterProposer.java
+++ b/same/src/main/java/com/orbekk/paxos/MasterProposer.java
@@ -17,11 +17,11 @@ public class MasterProposer {
         this.connections = connections;
     }
     
-    private boolean internalPropose(int roundId, int proposalNumber) {
+    private boolean internalPropose(int proposalNumber) {
         int promises = 0;
         for (String url : paxosUrls) {
             PaxosService paxos = connections.getPaxos(url);
-            boolean success = paxos.propose(myUrl, roundId, proposalNumber);
+            boolean success = paxos.propose(myUrl, proposalNumber);
             if (success) {
                 promises += 1;
             }
@@ -29,11 +29,11 @@ public class MasterProposer {
         return promises > paxosUrls.size() / 2;
     }
     
-    private boolean internalAcceptRequest(int roundId, int proposalNumber) {
+    private boolean internalAcceptRequest(int proposalNumber) {
         int accepts = 0;
         for (String url : paxosUrls) {
             PaxosService paxos = connections.getPaxos(url);
-            boolean success = paxos.acceptRequest(myUrl, roundId, proposalNumber);
+            boolean success = paxos.acceptRequest(myUrl, proposalNumber);
             if (success) {
                 accepts += 1;
             }
@@ -41,11 +41,11 @@ public class MasterProposer {
         return accepts > paxosUrls.size() / 2;        
     }
 
-    public boolean propose(int roundId, int proposalNumber) {
+    public boolean propose(int proposalNumber) {
         boolean success = false;
-        success = internalPropose(roundId, proposalNumber);
+        success = internalPropose(proposalNumber);
         if (success) {
-            success = internalAcceptRequest(roundId, proposalNumber);
+            success = internalAcceptRequest(proposalNumber);
         }
         if (success) {
             return true;
-- 
cgit v1.2.3