Author: wesw
Date: Mon Feb 25 17:40:10 2008
New Revision: 631059
URL: http://svn.apache.org/viewvc?rev=631059&view=rev
Log:
eliminating NPE, from WW-1969
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java?rev=631059&r1=631058&r2=631059&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
Mon Feb 25 17:40:10 2008
@@ -52,7 +52,6 @@
ValueStack stack = (ValueStack)
req.getAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY);
if (stack == null) {
- stack =
Dispatcher.getInstance().getContainer().getInstance(ValueStackFactory.class).createValueStack();
HttpServletResponse res = (HttpServletResponse)
pageContext.getResponse();
Dispatcher du = Dispatcher.getInstance();
@@ -61,6 +60,7 @@
"using Struts tags without the associated filter.
Struts tags are only usable when the request "+
"has passed through its servlet filter, which
initializes the Struts dispatcher needed for this tag.");
}
+ stack =
du.getContainer().getInstance(ValueStackFactory.class).createValueStack();
Map extraContext = du.createContextMap(new RequestMap(req),
req.getParameterMap(),
new SessionMap(req),
