From: <jde...@us...> - 2009-05-11 08:40:25
|
Revision: 9906 http://pcgen.svn.sourceforge.net/pcgen/?rev=9906&view=rev Author: jdempsey Date: 2009-05-11 08:40:14 +0000 (Mon, 11 May 2009) Log Message: ----------- Fix bug: Can't save character and see this in the Console - Merge from 5.16 branch Issue#: 2788116 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/Equipment.java Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java Modified: Trunk/pcgen/code/src/java/pcgen/core/Equipment.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/Equipment.java 2009-05-11 08:26:30 UTC (rev 9905) +++ Trunk/pcgen/code/src/java/pcgen/core/Equipment.java 2009-05-11 08:40:14 UTC (rev 9906) @@ -6001,7 +6001,11 @@ public List<FixedStringList> getDetailedAssociations(CDOMObject obj) { - return assocSupt.getAssocList(obj, AssociationListKey.CHOICES); + List<FixedStringList> list = assocSupt.getAssocList(obj, AssociationListKey.CHOICES); + if (list == null) { + list = Collections.emptyList(); + } + return list; } public List<String> getExpandedAssociations(CDOMObject obj) Modified: Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2009-05-11 08:26:30 UTC (rev 9905) +++ Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2009-05-11 08:40:14 UTC (rev 9906) @@ -17469,7 +17469,11 @@ public List<FixedStringList> getDetailedAssociations(CDOMObject obj) { - return assocSupt.getAssocList(obj, AssociationListKey.CHOICES); + List<FixedStringList> list = assocSupt.getAssocList(obj, AssociationListKey.CHOICES); + if (list == null) { + list = Collections.emptyList(); + } + return list; } public List<String> getExpandedAssociations(CDOMObject obj) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |