From: bdemsky <bdemsky@uci.edu>
Date: Mon, 1 Aug 2016 19:51:17 +0000 (-0700)
Subject: simplify code
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=iotcloud.git;a=commitdiff_plain;h=0a19fe655d9b21bfc5c693774bc05694f8c56912;ds=sidebyside

simplify code
---

diff --git a/src/java/iotcloud/Table.java b/src/java/iotcloud/Table.java
index cf7095e..bbcfe6a 100644
--- a/src/java/iotcloud/Table.java
+++ b/src/java/iotcloud/Table.java
@@ -134,27 +134,29 @@ final public class Table {
 				RejectedMessage rm=new RejectedMessage(s, localmachineid, old_seqn, new_seqn, false);
 				s.addEntry(rm);
 			} else {
-				long prev_seqn=old_seqn;
-				for(int i=0; i<rejectedmessagelist.size();i++) {
+				long prev_seqn=-1;
+				int i=0;
+				/* Go through list of missing messages */
+				for(;i<rejectedmessagelist.size();i++) {
 					long curr_seqn=rejectedmessagelist.get(i);
 					Slot s_msg=buffer.getSlot(curr_seqn);
-					if (s_msg!=null) {
-						long machineid=s_msg.getMachineID();
-						RejectedMessage rm=new RejectedMessage(s, machineid, curr_seqn, curr_seqn, true);
-						s.addEntry(rm);
-						if (old_seqn != -1 && old_seqn != curr_seqn) {
-							RejectedMessage rmprev=new RejectedMessage(s, localmachineid, old_seqn, prev_seqn, false);
-							s.addEntry(rmprev);
-						}
-						old_seqn = -1;
-					} else {
-						prev_seqn=curr_seqn;
-					}
+					if (s_msg!=null)
+						break;
+					prev_seqn=curr_seqn;
 				}
-				if (old_seqn != -1) {
+				/* Generate rejected message entry for missing messages */
+				if (prev_seqn != -1) {
 					RejectedMessage rm=new RejectedMessage(s, localmachineid, old_seqn, prev_seqn, false);
 					s.addEntry(rm);
 				}
+				/* Generate rejected message entries for present messages */
+				for(;i<rejectedmessagelist.size();i++) {
+					long curr_seqn=rejectedmessagelist.get(i);
+					Slot s_msg=buffer.getSlot(curr_seqn);
+					long machineid=s_msg.getMachineID();
+					RejectedMessage rm=new RejectedMessage(s, machineid, curr_seqn, curr_seqn, true);
+					s.addEntry(rm);
+				}
 			}
 		}