You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2014/08/13 11:07:14 UTC

[2/3] git commit: Solves problem with overwhelming WARNS in log during testing

Solves problem with overwhelming WARNS in log during testing


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/08ad1199
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/08ad1199
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/08ad1199

Branch: refs/heads/develop
Commit: 08ad1199edcc68d32549ba23ff3f0cedd87dadb5
Parents: 120830f
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Aug 13 10:33:13 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Aug 13 10:33:13 2014 +0200

----------------------------------------------------------------------
 .../xwork2/config/providers/XmlConfigurationProvider.java     | 4 ++--
 .../main/java/com/opensymphony/xwork2/mock/MockResult.java    | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/08ad1199/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java b/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
index a61d5e2..153ae90 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
@@ -727,7 +727,7 @@ public class XmlConfigurationProvider implements ConfigurationProvider {
                             + "  Did you mean '" + guessResultType(resultType) + "'?", resultElement);
                 }
 
-                String resultClass = config.getClazz();
+                String resultClass = config.getClassName();
 
                 // invalid result type specified in result definition
                 if (resultClass == null) {
@@ -759,7 +759,7 @@ public class XmlConfigurationProvider implements ConfigurationProvider {
                             }
                         } else {
                             if (LOG.isWarnEnabled()) {
-                            LOG.warn("no default parameter defined for result of type " + config.getName());
+                                LOG.warn("No default parameter defined for result [#0] of type [#1] ", config.getName(), config.getClassName());
                             }
                         }
                     }

http://git-wip-us.apache.org/repos/asf/struts/blob/08ad1199/xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java b/xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java
index d988df5..16b2a21 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java
@@ -26,7 +26,7 @@ import com.opensymphony.xwork2.Result;
  */
 public class MockResult implements Result {
 
-    public static final String DEFAULT_PARAM = null;
+    public static final String DEFAULT_PARAM = "foo";
 
     @Override
     public boolean equals(Object o) {
@@ -49,4 +49,9 @@ public class MockResult implements Result {
     public int hashCode() {
         return 10;
     }
+
+    public void setFoo(String foo) {
+        // no op
+    }
+
 }