rails-commits

[Erik V. <ev...@us...>]

Update of /cvsroot/rails/18xx/rails/game/action
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10820/rails/game/action

Modified Files:
	ExchangeTokens.java 
Log Message:
Catch an unexpected error condition - to be sorted out later

Index: ExchangeTokens.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/ExchangeTokens.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ExchangeTokens.java	3 Aug 2009 21:26:20 -0000	1.2
--- ExchangeTokens.java	1 Jan 2010 14:34:06 -0000	1.3
***************
*** 58,63 ****
          StringBuffer b = new StringBuffer();
          b.append("ExchangeTokens for "+companyName+":");
!         for (ExchangeableToken token : tokensToExchange) {
!             b.append(" ").append(token.toString());
          }
          b.append(" min=").append (minNumberToExchange);
--- 58,68 ----
          StringBuffer b = new StringBuffer();
          b.append("ExchangeTokens for "+companyName+":");
!         if (tokensToExchange != null) {
!             for (ExchangeableToken token : tokensToExchange) {
!                 b.append(" ").append(token.toString());
!             }
!         } else {
!             b.append ("-none?-");
!             log.error("No exchangable tokens found when expected - error seen during Undo CGR formation");
          }
          b.append(" min=").append (minNumberToExchange);