[vassalengine-svn] SF.net SVN: vassalengine:[8613] VASSAL-src/branches/Brent-3.2-New/src/ VASSAL/build/module/properties/EnumeratedPropertyPrompt.java

[<swa...@us...>]

Revision: 8613
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=8613&view=rev
Author:   swampwallaby
Date:     2013-03-31 00:45:21 +0000 (Sun, 31 Mar 2013)
Log Message:
-----------
Bug 10012 - NPE in EnumeratedPropertyPrompt.getNewValue()

Modified Paths:
--------------
    VASSAL-src/branches/Brent-3.2-New/src/VASSAL/build/module/properties/EnumeratedPropertyPrompt.java

Modified: VASSAL-src/branches/Brent-3.2-New/src/VASSAL/build/module/properties/EnumeratedPropertyPrompt.java
===================================================================
--- VASSAL-src/branches/Brent-3.2-New/src/VASSAL/build/module/properties/EnumeratedPropertyPrompt.java	2013-03-30 11:26:19 UTC (rev 8612)
+++ VASSAL-src/branches/Brent-3.2-New/src/VASSAL/build/module/properties/EnumeratedPropertyPrompt.java	2013-03-31 00:45:21 UTC (rev 8613)
@@ -54,7 +54,12 @@
     for (int i = 0; i < finalValues.length; i++) {
       String value;
       try {
-        value = valueExpressions[i].evaluate(propertySource.getPropertySource());
+        if (propertySource == null) {
+          value = valueExpressions[i].evaluate(); 
+        }
+        else {
+          value = valueExpressions[i].evaluate(propertySource.getPropertySource());
+        }
       }
       catch (ExpressionException e) {
         value = valueExpressions[i].getExpression();

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