Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 09:36:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed needless double check in log

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1131315 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Maurizio Cucchiara
2011-06-04 05:16:30 +00:00
parent dcd9409764
commit 9e35546504
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/util/TextProviderHelper.java
+3 -15
View File
@@ -21,15 +21,13 @@
package org.apache.struts2.util;
import com.opensymphony.xwork2.TextProvider;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import com.opensymphony.xwork2.TextProvider;
import java.util.Iterator;
import java.util.List;
import java.util.LinkedList;
import java.util.Collections;
import java.util.List;
/**
* Helper methods to access text from TextProviders
@@ -71,9 +69,7 @@ public class TextProviderHelper {
String msg = null;
TextProvider tp = null;
for (Iterator iterator = stack.getRoot().iterator(); iterator.hasNext();) {
Object o = iterator.next();
for (Object o : stack.getRoot()) {
if (o instanceof TextProvider) {
tp = (TextProvider) o;
msg = tp.getText(key, null, args, stack);
@@ -94,22 +90,14 @@ public class TextProviderHelper {
if (LOG.isWarnEnabled()) {
if (tp != null) {
if (LOG.isWarnEnabled()) {
LOG.warn("The first TextProvider in the ValueStack ("+tp.getClass().getName()+") could not locate the message resource with key '"+key+"'");
}
} else {
if (LOG.isWarnEnabled()) {
LOG.warn("Could not locate the message resource '"+key+"' as there is no TextProvider in the ValueStack.");
}
}
if (msg.equals(defaultMessage)) {
if (LOG.isWarnEnabled()) {
LOG.warn("The default value expression '"+defaultMessage+"' was evaluated and did not match a property. The literal value '"+defaultMessage+"' will be used.");
}
} else {
if (LOG.isWarnEnabled()) {
LOG.warn("The default value expression '"+defaultMessage+"' evaluated to '"+msg+"'");
}
}
}
}