[pcgen-commit-svn] SF.net SVN: pcgen:[9880] Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser. java

[<jde...@us...>]

Revision: 9880
          http://pcgen.svn.sourceforge.net/pcgen/?rev=9880&view=rev
Author:   jdempsey
Date:     2009-04-22 12:32:19 +0000 (Wed, 22 Apr 2009)

Log Message:
-----------
Fix bug: Missing Follower TYPE causes NPE
  - Merge from 5.16 branch
Issue#: 2778132

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java

Modified: Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java	2009-04-22 11:45:34 UTC (rev 9879)
+++ Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java	2009-04-22 12:32:19 UTC (rev 9880)
@@ -2863,7 +2863,8 @@
 
 		if (!Constants.EMPTY_STRING.equals(aFollower.getFileName())
 			&& !Constants.EMPTY_STRING.equals(aFollower.getName())
-			&& !Constants.EMPTY_STRING.equals(aFollower.getType()))
+			&& !Constants.EMPTY_STRING.equals(aFollower.getType())
+			&& aFollower.getType() != null)
 		{
 			thePC.addFollower(aFollower);
 		}


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