projects
/
fleet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cffe02b
)
InterpreterDock: better error message when torpedoes collide
author
Adam Megacz
<adam@megacz.com>
Sat, 22 Aug 2009 21:33:20 +0000
(14:33 -0700)
committer
Adam Megacz
<adam@megacz.com>
Sat, 22 Aug 2009 21:33:20 +0000
(14:33 -0700)
src/edu/berkeley/fleet/interpreter/InterpreterDock.java
patch
|
blob
|
history
diff --git
a/src/edu/berkeley/fleet/interpreter/InterpreterDock.java
b/src/edu/berkeley/fleet/interpreter/InterpreterDock.java
index
a08531c
..
4619209
100644
(file)
--- 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 (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;
}
torpedoWaiting = true;
return;
}