[Megameknet-cvs] MegaMekNET/src/server/campaign SHouse.java,1.95,1.96

[Helge R. <mcw...@us...>]

Update of /cvsroot/megameknet/MegaMekNET/src/server/campaign
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20084/src/server/campaign

Modified Files:
	SHouse.java 
Log Message:
fixed possible NPE

Index: SHouse.java
===================================================================
RCS file: /cvsroot/megameknet/MegaMekNET/src/server/campaign/SHouse.java,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** SHouse.java	26 Mar 2005 17:44:25 -0000	1.95
--- SHouse.java	2 Apr 2005 09:08:07 -0000	1.96
***************
*** 1839,1848 ****
  
  				List l = VoteManager.getInstance().getVotesFrom(name);
! 				Iterator it = l.iterator();
! 				while (it.hasNext()){
! 					Vote v = (Vote)it.next();
! 					VoteManager.getInstance().removeVote(v);
  				}
- 		
  				
  			getMembers().remove(name.toLowerCase());
--- 1839,1849 ----
  
  				List l = VoteManager.getInstance().getVotesFrom(name);
! 				if (l != null){
! 					Iterator it = l.iterator();
! 					while (it.hasNext()){
! 						Vote v = (Vote)it.next();
! 						VoteManager.getInstance().removeVote(v);
! 					}
  				}
  				
  			getMembers().remove(name.toLowerCase());