From: Adam Megacz <adam@megacz.com>
Date: Sat, 22 Aug 2009 21:33:39 +0000 (-0700)
Subject: InterpreterDock: bug fix that was causing instructions to vanish
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=3bdab7841af0bc2ae201b25a5e3a3770c616085c;hp=7d36e8e8c4c6495146bc87c76984649d7df14710;p=fleet.git

InterpreterDock: bug fix that was causing instructions to vanish
---

diff --git a/src/edu/berkeley/fleet/interpreter/InterpreterDock.java b/src/edu/berkeley/fleet/interpreter/InterpreterDock.java
index 4619209..3cacdf1 100644
--- a/src/edu/berkeley/fleet/interpreter/InterpreterDock.java
+++ b/src/edu/berkeley/fleet/interpreter/InterpreterDock.java
@@ -177,12 +177,8 @@ class InterpreterDock extends FleetTwoDock {
 
             } else if (instructions.peek() instanceof Instruction.Abort) {
                 requeueStageInCirculatingState = false;
-                // HACK
-                while (instructionsBackedUpIntoSwitchFabric.size()!=0) {
-                    Instruction i = instructionsBackedUpIntoSwitchFabric.remove();
-                    addInstruction(i);
-                    instructionsBackedUpIntoSwitchFabric.clear();
-                }
+                while (instructionsBackedUpIntoSwitchFabric.size()!=0)
+                    addInstruction(instructionsBackedUpIntoSwitchFabric.remove());
                 break;
 
             } else if (instructions.peek() instanceof Instruction.Flush) {