[jbosstools-commits] JBoss Tools SVN: r42412 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb.

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2012-07-05 12:35:27 -0400 (Thu, 05 Jul 2012)
New Revision: 42412

Modified:
   trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
Log:
JBIDE-3526
https://issues.jboss.org/browse/JBIDE-3526
Vars are loaded from ui:param.





Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java	2012-07-05 15:30:04 UTC (rev 42411)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java	2012-07-05 16:35:27 UTC (rev 42412)
@@ -694,7 +694,7 @@
 					}
 				}
 			}
-			if(!vars.isEmpty()) {
+			if(vars != null && !vars.isEmpty()) {
 				PageInclude include = new PageInclude(context.getResource().getFullPath(), includedFile.getFullPath(), vars);
 				IncludeModel.getInstance().addInclude(context.getResource().getFullPath(), include);
 			}