1.1 --- a/webidor/src/main/java/cz/xelfi/quoridor/webidor/Game.java	Sun Aug 30 14:37:47 2009 +0200
     1.2 +++ b/webidor/src/main/java/cz/xelfi/quoridor/webidor/Game.java	Sun Aug 30 16:04:27 2009 +0200
     1.3 @@ -106,8 +106,10 @@
     1.4          @Override
     1.5          public List<Move> unmarshal(String[] arr) throws Exception {
     1.6              List<Move> res = new ArrayList<Move>();
     1.7 -            for (String v : arr) {
     1.8 -                res.add(Move.valueOf(v));
     1.9 +            if (arr != null) {
    1.10 +                for (String v : arr) {
    1.11 +                    res.add(Move.valueOf(v));
    1.12 +                }
    1.13              }
    1.14              return res;
    1.15          }
    1.16 @@ -115,8 +117,10 @@
    1.17          @Override
    1.18          public String[] marshal(List<Move> arr) throws Exception {
    1.19              List<String> res = new ArrayList<String>();
    1.20 -            for (Move m : arr) {
    1.21 -                res.add(m.toString()); 
    1.22 +            if (arr != null) {
    1.23 +                for (Move m : arr) {
    1.24 +                    res.add(m.toString());
    1.25 +                }
    1.26              }
    1.27              return res.toArray(new String[0]);
    1.28          }
    1.29 @@ -126,12 +130,12 @@
    1.30  
    1.31          @Override
    1.32          public Board unmarshal(String v) throws Exception {
    1.33 -            return Board.valueOf(v);
    1.34 +            return v == null ? null : Board.valueOf(v);
    1.35          }
    1.36  
    1.37          @Override
    1.38          public String marshal(Board v) throws Exception {
    1.39 -            return v.toString();
    1.40 +            return v == null ? null : v.toString();
    1.41          }
    1.42  
    1.43      }