From: Adam Megacz <adam@megacz.com>
Date: Sat, 22 Aug 2009 21:33:20 +0000 (-0700)
Subject: InterpreterDock: better error message when torpedoes collide
X-Git-Url: http://git.megacz.com/?p=fleet.git;a=commitdiff_plain;h=7d36e8e8c4c6495146bc87c76984649d7df14710

InterpreterDock: better error message when torpedoes collide
---

diff --git a/src/edu/berkeley/fleet/interpreter/InterpreterDock.java b/src/edu/berkeley/fleet/interpreter/InterpreterDock.java
index a08531c..4619209 100644
--- a/src/edu/berkeley/fleet/interpreter/InterpreterDock.java
+++ b/src/edu/berkeley/fleet/interpreter/InterpreterDock.java
@@ -64,7 +64,7 @@ class InterpreterDock extends FleetTwoDock {
                 if (p.isToken()) {
                     if (instructionsBackedUpIntoSwitchFabric.size()!=0)
                         throw new RuntimeException("torpedo arrived while instructions were backed up into switch fabric");
-                    if (torpedoWaiting) throw new RuntimeException("two torpedoes collided!");
+                    if (torpedoWaiting) throw new RuntimeException("two torpedoes collided at dock "+this);
                     torpedoWaiting = true;
                     return;
                 }