[Rails-commits] rails/common

[Brett L. <wak...@us...>]

 rails/common/parser/Tag.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a7948aad7f7b2010df2988b1076919342d6cb2d8
Author: Brett Lentz <bre...@gm...>
Date:   Thu Jul 21 10:29:22 2011 -0700

    Tag: ignore null gameOptions.

diff --git a/rails/common/parser/Tag.java b/rails/common/parser/Tag.java
index 7a7d46e..a1aa913 100644
--- a/rails/common/parser/Tag.java
+++ b/rails/common/parser/Tag.java
@@ -320,7 +320,7 @@ public class Tag {
                 	// For backwards compatibility: search for an extended name
                     if (optionValue == null) {
                     	for (String optName : gameOptions.keySet()) {
-                    		if (optName.startsWith(name)) {
+                    		if (optName != null && optName.startsWith(name)) {
                     			optionValue = gameOptions.get(optName);
                     			log.warn("Option name "+name+" replaced by "+optName);
                     			break;