[vassalengine-svn] SF.net SVN: vassalengine:[4591] VASSAL-src/branches/uckelman-work/src/ VASSAL/tools

[<uck...@us...>]

Revision: 4591
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=4591&view=rev
Author:   uckelman
Date:     2008-11-30 19:48:02 +0000 (Sun, 30 Nov 2008)

Log Message:
-----------
Merged trunk 4566:HEAD.

Modified Paths:
--------------
    VASSAL-src/branches/uckelman-work/src/VASSAL/tools/SavedGameUpdater.java
    VASSAL-src/branches/uckelman-work/src/VASSAL/tools/version/VassalVersionTokenizer.java

Modified: VASSAL-src/branches/uckelman-work/src/VASSAL/tools/SavedGameUpdater.java
===================================================================
--- VASSAL-src/branches/uckelman-work/src/VASSAL/tools/SavedGameUpdater.java	2008-11-30 18:33:00 UTC (rev 4590)
+++ VASSAL-src/branches/uckelman-work/src/VASSAL/tools/SavedGameUpdater.java	2008-11-30 19:48:02 UTC (rev 4591)
@@ -61,8 +61,9 @@
       catch (InterruptedException e) {
       }
     }
-    for (GamePiece p :
-         GameModule.getGameModule().getGameState().getAllPieces()) {
+    
+    GamePiece[] gp_array = GameModule.getGameModule().getGameState().getAllPieces().toArray(new GamePiece[0]);
+    for (GamePiece p : gp_array) {
       if (!(p instanceof Stack)) {
         String slotId = pieceSlot.getProperty(p.getType());
         if (slotId != null) {

Modified: VASSAL-src/branches/uckelman-work/src/VASSAL/tools/version/VassalVersionTokenizer.java
===================================================================
--- VASSAL-src/branches/uckelman-work/src/VASSAL/tools/version/VassalVersionTokenizer.java	2008-11-30 18:33:00 UTC (rev 4590)
+++ VASSAL-src/branches/uckelman-work/src/VASSAL/tools/version/VassalVersionTokenizer.java	2008-11-30 19:48:02 UTC (rev 4591)
@@ -74,6 +74,7 @@
     tags.put("beta3", 4023);
     tags.put("beta4", 4266);
     tags.put("beta5", 4409);
+    tags.put("beta6", 4577);
   }
 
   /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.