svn commit: r1520763 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
Author: rgielen
Date: Sat Sep 7 13:26:25 2013
New Revision: 1520763
URL: http://svn.apache.org/r1520763
Log:
WW-4193 - Patch by Christoph Nenning
With this patch it is checked if devMode is active and if logMissingProperties
is enabled before the exception is logged
- refactored shouldLogNoSuchPropertyWarning() to
shouldLogMissingPropertyWarning() and using it to handle MethodFailedExceptions.
- updated void handleOgnlException(String expr, Object value, boolean
throwExceptionOnFailure, OgnlException e) to use it.
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java?rev=1520763&r1=1520762&r2=1520763&view=diff
==
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
Sat Sep 7 13:26:25 2013
@@ -203,10 +203,15 @@ public class OgnlValueStack implements S
}
private void handleOgnlException(String expr, Object value, boolean
throwExceptionOnFailure, OgnlException e) {
-String msg = "Error setting expression '" + expr + "' with value '" +
value + "'";
-if (LOG.isWarnEnabled()) {
+ boolean shouldLog = shouldLogMissingPropertyWarning(e);
+ String msg = null;
+ if (throwExceptionOnFailure || shouldLog) {
+ msg = "Error setting expression '" + expr + "' with value '" +
value + "'";
+ }
+ if (shouldLog) {
LOG.warn(msg, e);
-}
+ }
+
if (throwExceptionOnFailure) {
throw new XWorkException(msg, e);
}
@@ -320,7 +325,7 @@ public class OgnlValueStack implements S
private Object handleOgnlException(String expr, boolean
throwExceptionOnFailure, OgnlException e) {
Object ret = findInContext(expr);
if (ret == null) {
-if (shouldLogNoSuchPropertyWarning(e)) {
+if (shouldLogMissingPropertyWarning(e)) {
LOG.warn("Could not find property [" +
((NoSuchPropertyException) e).getName() + "]");
}
if (throwExceptionOnFailure) {
@@ -330,8 +335,9 @@ public class OgnlValueStack implements S
return ret;
}
-private boolean shouldLogNoSuchPropertyWarning(OgnlException e) {
-return e instanceof NoSuchPropertyException && devMode &&
logMissingProperties;
+private boolean shouldLogMissingPropertyWarning(OgnlException e) {
+return (e instanceof NoSuchPropertyException || e instanceof
MethodFailedException)
+ && devMode && logMissingProperties;
}
private Object tryFindValue(String expr, Class asType) throws
OgnlException {
svn commit: r1520781 - /struts/struts2/trunk/.gitignore
Author: grobmeier Date: Sat Sep 7 15:28:02 2013 New Revision: 1520781 URL: http://svn.apache.org/r1520781 Log: Added .gitignore to support users with git-svn and working on github mirrors Added: struts/struts2/trunk/.gitignore Added: struts/struts2/trunk/.gitignore URL: http://svn.apache.org/viewvc/struts/struts2/trunk/.gitignore?rev=1520781&view=auto == --- struts/struts2/trunk/.gitignore (added) +++ struts/struts2/trunk/.gitignore Sat Sep 7 15:28:02 2013 @@ -0,0 +1,52 @@ +core/target +xwork-core/target +archetypes/struts2-archetype-angularjs/target +archetypes/struts2-archetype-blank/target +archetypes/struts2-archetype-convention/target +archetypes/struts2-archetype-dbportlet/target +archetypes/struts2-archetype-plugin/target +archetypes/struts2-archetype-portlet/target +archetypes/struts2-archetype-starter/target +archetypes/target +plugins/convention/target +plugins/embeddedjsp/target +plugins/dojo/target +plugins/osgi/target +plugins/cdi/target +plugins/codebehind/target +plugins/spring/target +plugins/jfreechart/target +apps/rest-showcase/target +apps/mailreader/target +apps/portlet/target +apps/blank/target +apps/jboss-blank/target +apps/mailreader/target +apps/portlet/target +apps/showcase/target +apps/target +bundles/admin/target +plugins/config-browser/target +plugins/jasperreports/target +plugins/jsf/target +plugins/json/target +plugins/portlet-tiles/target +plugins/portlet/target +plugins/sitegraph/target +plugins/sitemesh/target +plugins/struts1/target +plugins/tiles3/target +plugins/javatemplates/target +bundles/demo/target +plugins/rest/target +plugins/plexus/target +plugins/testng/target +plugins/dwr/target +plugins/gxp/target +plugins/oval/target +plugins/junit/target +plugins/tiles/target +bundles/target +plugins/target +target +plugins/testng/test-output \ No newline at end of file
svn commit: r1520784 - /struts/struts2/trunk/.gitignore
Author: rgielen Date: Sat Sep 7 16:58:08 2013 New Revision: 1520784 URL: http://svn.apache.org/r1520784 Log: - ignore IDEA project files Modified: struts/struts2/trunk/.gitignore Modified: struts/struts2/trunk/.gitignore URL: http://svn.apache.org/viewvc/struts/struts2/trunk/.gitignore?rev=1520784&r1=1520783&r2=1520784&view=diff == --- struts/struts2/trunk/.gitignore (original) +++ struts/struts2/trunk/.gitignore Sat Sep 7 16:58:08 2013 @@ -1,3 +1,7 @@ +.idea +*.iml +*.ipr +*.iws core/target xwork-core/target archetypes/struts2-archetype-angularjs/target
[CONF] Confluence Changes in the last 24 hours
Apache Ambari (Incubating) Pages Page: Failed to execute goal created by vahidkadivar[09:00 AM] Comments Page: Failed to execute goal has a new comment [ vahidkadivar] Apache ActiveMQ CPP Pages Home page: Index edited by Timothy Bish[11:28 AM] (view changes) Blog post: ActiveMQ-CPP v3.8.0 Released. created by Timothy Bish[11:27 AM] Page: ActiveMQ-CPP 3.8.0 Release edited by Timothy Bish[11:25 AM] (view changes) Page: Download edited by Timothy Bish[11:21 AM] (view changes) Apache Any23 (Incubating) Pages Blog post: sacs lancels tel que tant de équipements created by frlancelop[06:06 AM] Blog post: lancel pas cher acquérir mens portefeuille en ce qui concerne on-line domine created by frlancelop[05:33 AM] Blog post: Great stuff! created by omegareplica1848[03:09 AM] Blog post: Great replica omega created by omegareplica1848[03:08 AM] Blog post: Great watches for sale! created by omegareplica1848[03:06 AM] Drill Wiki Pages Page: Demo HowTo edited by Ted2Dunning[04:50 PM] (view changes) Apache Flex Comments Page: Mustella Overview has 2 new comments [ Frédéric THOMAS] Apache Maven Comments Page: MojoFailureException has a new comment [ vahidkadivar] Apache OpenOffice Community Pages Page: Directory of Volunteers edited by Rainer Bielefeld[09:51 AM] (view changes) Apache Pig Comments Page: Pig on Storm Proposal has a new comment [ Pradeep Gollakota] Apache Qpid Pages Page: 0.24 Release edited by Justin Ross[06:17 PM] (view changes) Spark Pages Page: Powered By Spark
