[jboss-cvs] JBossAS SVN: r95436 - trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers.

[jboss-cvs-commits at lists.jboss.org]

Author: remy.maucherat at jboss.com
Date: 2009-10-22 14:02:43 -0400 (Thu, 22 Oct 2009)
New Revision: 95436

Modified:
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
Log:
- Fix NPE accessing the scope.

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2009-10-22 17:55:22 UTC (rev 95435)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2009-10-22 18:02:43 UTC (rev 95436)
@@ -977,7 +977,8 @@
                      tagVariableInfo.setNameFromAttribute(variableMetaData.getNameFromAttribute());
                      tagVariableInfo.setClassName(variableMetaData.getVariableClass());
                      tagVariableInfo.setDeclare(variableMetaData.getDeclare());
-                     tagVariableInfo.setScope(variableMetaData.getScope().toString());
+                     if (variableMetaData.getScope() != null)
+                        tagVariableInfo.setScope(variableMetaData.getScope().toString());
                      tagInfo.addTagVariableInfo(tagVariableInfo);
                   }
                }