[Rails-commits] 18xx/rails/game PrivateCompany.java,1.34,1.35

[Stefan F. <ste...@us...>]

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

Modified Files:
	PrivateCompany.java 
Log Message:
Check for null in preventClosingConditions (just in case)

Index: PrivateCompany.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PrivateCompany.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** PrivateCompany.java	5 Feb 2010 19:55:44 -0000	1.34
--- PrivateCompany.java	6 Feb 2010 14:57:31 -0000	1.35
***************
*** 243,247 ****
      public boolean isCloseable() {
  
!       if (preventClosingConditions.isEmpty()) return true;
  
        if (preventClosingConditions.contains("doesNotClose")) {
--- 243,247 ----
      public boolean isCloseable() {
  
!       if ((preventClosingConditions == null) || preventClosingConditions.isEmpty()) return true;
  
        if (preventClosingConditions.contains("doesNotClose")) {
***************
*** 256,259 ****
--- 256,260 ----
        return true;
      }
+     
      public List<String> getPreventClosingConditions() {
          return preventClosingConditions;