Author: mrdon
Date: Sun Oct 1 20:53:59 2006
New Revision: 451867
URL: http://svn.apache.org/viewvc?view=rev&rev=451867
Log:
Minor error message change for XW-420, minor formatting on error report
WW-1453
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java?view=diff&rev=451867&r1=451866&r2=451867
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
Sun Oct 1 20:53:59 2006
@@ -333,7 +333,7 @@
request.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY, stack);
}
} catch (ConfigurationException e) {
- LOG.error("Could not find action", e);
+ LOG.error("Could not find action or result", e);
sendError(request, response, context,
HttpServletResponse.SC_NOT_FOUND, e);
} catch (Exception e) {
LOG.error("Could not execute action", e);
Modified:
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl?view=diff&rev=451867&r1=451866&r2=451867
==============================================================================
---
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl
(original)
+++
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl
Sun Oct 1 20:53:59 2006
@@ -72,10 +72,10 @@
<#list snippet as line>
<#if (line_index == 2)>
- <#if (rootloc.columnNumber >= 0)>
+ <#if (rootloc.columnNumber >= 0)>
<pre
style="background:yellow">${(line[0..(rootloc.columnNumber-3)]?html)}<span
style="background:red">${(line[(rootloc.columnNumber-2)]?html)}</span><#if
((rootloc.columnNumber)<line.length())>${(line[(rootloc.columnNumber-1)..]?html)}</#if></pre>
<#else>
- <pre style="background:yellow">${line?html}</pre>
+ <pre
style="background:yellow">${line?html}</pre>
</#if>
<#else>
<pre>${line?html}</pre>
