From: <jde...@us...> - 2012-09-17 11:06:01
|
Revision: 17322 http://pcgen.svn.sourceforge.net/pcgen/?rev=17322&view=rev Author: jdempsey Date: 2012-09-17 11:05:51 +0000 (Mon, 17 Sep 2012) Log Message: ----------- Fix bug: NPE - Loading a character with an Ability with a Chooser that no longer exists breaks load Issue#: CODE-1635 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 2012-09-17 10:00:46 UTC (rev 17321) +++ Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java 2012-09-17 11:05:51 UTC (rev 17322) @@ -2771,11 +2771,18 @@ ChoiceManagerList<Object> controller = ChooserUtilities.getConfiguredController(ability, thePC, category, new ArrayList<String>()); - String[] assoc = appliedToKey.split(Constants.COMMA, -1); - for (String string : assoc) + if (controller != null) { - controller.restoreChoice(thePC, ability, string); + String[] assoc = appliedToKey.split(Constants.COMMA, -1); + for (String string : assoc) + { + controller.restoreChoice(thePC, ability, string); + } } + else + { + warnings.add("Failed to find choose controller for ability " + ability); + } } } else if (TAG_SAVE.equals(tag)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |