svn commit: r551011 - /struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java

[pbenedict]

Author: pbenedict
Date: Tue Jun 26 19:13:34 2007
New Revision: 551011

URL: http://svn.apache.org/viewvc?view=rev&rev=551011
Log:
STR-1709: Add null check on javascript field focus

Modified:
    
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java

Modified: 
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java?view=diff&rev=551011&r1=551010&r2=551011
==============================================================================
--- 
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java
 (original)
+++ 
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java
 Tue Jun 26 19:13:34 2007
@@ -721,7 +721,8 @@
         results.append(lineEnd);
         results.append(lineEnd);
 
-        results.append("  if (focusControl.type != \"hidden\" && ");
+        results.append("  if (focusControl != null && ");
+        results.append("focusControl.type != \"hidden\" && ");
         results.append("!focusControl.disabled && ");
         results.append("focusControl.style.display != \"none\") {");
         results.append(lineEnd);