struts git commit: Drops unneeded method

2016-06-02 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/support-2-3 34025eafe -> 3f526d630


Drops unneeded method


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

Branch: refs/heads/support-2-3
Commit: 3f526d630aa56393233500c874293c29abec54ae
Parents: 34025ea
Author: Lukasz Lenart 
Authored: Thu Jun 2 16:46:40 2016 +0200
Committer: Lukasz Lenart 
Committed: Thu Jun 2 16:46:40 2016 +0200

--
 .../src/main/java/com/opensymphony/xwork2/ActionSupport.java| 4 
 .../test/java/com/opensymphony/xwork2/ActionSupportTest.java| 5 ++---
 2 files changed, 2 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/3f526d63/xwork-core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
--
diff --git 
a/xwork-core/src/main/java/com/opensymphony/xwork2/ActionSupport.java 
b/xwork-core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
index 31eb5d3..752ecbf 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
@@ -178,10 +178,6 @@ public class ActionSupport implements Action, 
Validateable, ValidationAware, Tex
 return INPUT;
 }
 
-public String doDefault() throws Exception {
-return SUCCESS;
-}
-
 /**
  * A default implementation that does nothing an returns "success".
  * 

http://git-wip-us.apache.org/repos/asf/struts/blob/3f526d63/xwork-core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java
--
diff --git 
a/xwork-core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java 
b/xwork-core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java
index 23206ab..fafc960 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java
@@ -68,7 +68,6 @@ public class ActionSupportTest extends XWorkTestCase {
 }
 
 assertEquals(Action.INPUT, as.input());
-assertEquals(Action.SUCCESS, as.doDefault());
 assertEquals(Action.SUCCESS, as.execute());
 try {
 as.clone();
@@ -169,7 +168,7 @@ public class ActionSupportTest extends XWorkTestCase {
 ActionContext.getContext().setLocale(new Locale("da"));
 MyActionSupport mas = new MyActionSupport();
 
-assertEquals("santa", mas.doDefault());
+assertEquals("santa", mas.execute());
 assertNotNull(mas.getTexts());
 
 assertEquals(false, mas.hasActionMessages());
@@ -343,7 +342,7 @@ public class ActionSupportTest extends XWorkTestCase {
 private Double val;
 
 @Override
-public String doDefault() throws Exception {
+public String execute() throws Exception {
 return "santa";
 }

struts git commit: Drops pre-evaluation of name

2016-06-02 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/support-2-3 3f526d630 -> 88b885339


Drops pre-evaluation of name


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

Branch: refs/heads/support-2-3
Commit: 88b885339a6cb7e31393cbb723a57ddf8f8b4494
Parents: 3f526d6
Author: Lukasz Lenart 
Authored: Thu Jun 2 16:57:44 2016 +0200
Committer: Lukasz Lenart 
Committed: Thu Jun 2 16:57:44 2016 +0200

--
 core/src/main/java/org/apache/struts2/components/UIBean.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/88b88533/core/src/main/java/org/apache/struts2/components/UIBean.java
--
diff --git a/core/src/main/java/org/apache/struts2/components/UIBean.java 
b/core/src/main/java/org/apache/struts2/components/UIBean.java
index 5fd99a9..9c973b3 100644
--- a/core/src/main/java/org/apache/struts2/components/UIBean.java
+++ b/core/src/main/java/org/apache/struts2/components/UIBean.java
@@ -649,7 +649,6 @@ public abstract class UIBean extends Component {
 addParameter("themeExpansionToken", uiThemeExpansionToken);
 addParameter("expandTheme", uiThemeExpansionToken + theme);
 
-String name = null;
 String providedLabel = null;
 
 if (this.key != null) {
@@ -666,8 +665,7 @@ public abstract class UIBean extends Component {
 }
 
 if (this.name != null) {
-name = findString(this.name);
-addParameter("name", name);
+addParameter("name", findString(this.name));
 }
 
 if (label != null) {