1. Joseph Bane
  2. COS 520 Lamport 2

Commits

Joseph Bane  committed 8f519c8 Merge

Merged with Graham.

  • Participants
  • Parent commits 02f0a80, 20d06e3
  • Branches default

Comments (0)

Files changed (1)

File Process.cpp

View file
  • Ignore whitespace
 
   if (timeSince > delta) {
     // This represents rejection of the original request.
-    cout << "REJECT: Request " << r.getID() << " (" << timeSince << ", " << delta << ") " << " [" << simulation->status() << "]\n";
+    cout << "REJECT: Request " << r.getID() << " (" << timeSince << ", " << delta << ")\n";
   }
   else {
     // Create new message objects to ask for votes
   else {
     const int timeSince = simulation->getTime() - m.getRequestTime();
     
-    if ( (int(m.getVote()) == int(Message::vote::accept))
-	 && (timeSince < delta*2) ) {
+    //if ( (int(m.getVote()) == int(Message::vote::accept))
+    // && (timeSince < delta*2) ) {
+    if (int(m.getVote()) == int(Message::vote::accept)) {
       
       // Accept Request
       cout << "PID: " << id << "  ACCEPT: Request " << m.getRequestID() << " (" << timeSince << ", " << delta*2 << ")\n";