Commits

Joseph Bane committed 2e2e003 Merge

Merged.

Comments (0)

Files changed (1)

 void Process::pushMessage(Message m)
 {
   messages.insert(m);
+  // m.display();
 }
 
 
     // Create new message objects to ask for votes
     for (int i=1; i<total; i++) {
       if (i != id) {
-        simulation->sendMessage( Message(i, id, r.getTimestamp(), r.getID(), Message::vote::accept) );
+        simulation->sendMessage( Message(i, id, r.getTimestamp(), r.getID(), Message::vote::null) );
       }
     }
   }
   // automatically accept on a vote request
   if (m.getVote() == Message::vote::null) {
     // Create a new message object to accept
+    cout << "91\n";
     simulation->sendMessage( Message(m.getTo(), m.getFrom(), m.getRequestTime(), m.getRequestID(), Message::vote::accept) );
   }