You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ya...@apache.org on 2018/05/30 08:27:36 UTC
[struts] branch master updated: delete unused local variable
timerKey
This is an automated email from the ASF dual-hosted git repository.
yasserzamani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/master by this push:
new b804b86 delete unused local variable timerKey
b804b86 is described below
commit b804b86744a4c257f83ab0d68ac60567000c7332
Author: Yasser Zamani <ya...@apache.org>
AuthorDate: Wed May 30 12:56:10 2018 +0430
delete unused local variable timerKey
See also WW-4779
---
core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java | 2 --
.../struts2/sitemesh/OldDecorator2NewStrutsFreemarkerDecorator.java | 1 -
.../struts2/sitemesh/OldDecorator2NewStrutsVelocityDecorator.java | 1 -
3 files changed, 4 deletions(-)
diff --git a/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java b/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
index 6514ea9..e8e7bae 100644
--- a/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
+++ b/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
@@ -295,7 +295,6 @@ public class DefaultActionInvocation implements ActionInvocation {
protected void createAction(Map<String, Object> contextMap) {
// load action
- String timerKey = "actionCreate: " + proxy.getActionName();
try {
action = objectFactory.buildAction(proxy.getActionName(), proxy.getNamespace(), proxy.getConfig(), contextMap);
} catch (InstantiationException e) {
@@ -365,7 +364,6 @@ public class DefaultActionInvocation implements ActionInvocation {
private void executeResult() throws Exception {
result = createResult();
- String timerKey = "executeResult: " + getResultCode();
if (result != null) {
result.execute(this);
} else if (resultCode != null && !Action.NONE.equals(resultCode)) {
diff --git a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsFreemarkerDecorator.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsFreemarkerDecorator.java
index 50970f9..ec792ba 100644
--- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsFreemarkerDecorator.java
+++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsFreemarkerDecorator.java
@@ -65,7 +65,6 @@ public class OldDecorator2NewStrutsFreemarkerDecorator extends OldDecorator2NewS
* @param ctx The action context for this request, populated with the server state
*/
protected void render(Content content, HttpServletRequest request, HttpServletResponse response, ServletContext servletContext, ActionContext ctx) throws ServletException, IOException {
- String timerKey = "FreemarkerPageFilter_applyDecorator: ";
if (freemarkerManager == null) {
throw new ServletException("Missing freemarker dependency");
}
diff --git a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsVelocityDecorator.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsVelocityDecorator.java
index 90c1cda..cd04173 100644
--- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsVelocityDecorator.java
+++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsVelocityDecorator.java
@@ -62,7 +62,6 @@ public class OldDecorator2NewStrutsVelocityDecorator extends OldDecorator2NewStr
* @param ctx The action context for this request, populated with the server state
*/
protected void render(Content content, HttpServletRequest request, HttpServletResponse response, ServletContext servletContext, ActionContext ctx) throws ServletException, IOException {
- String timerKey = "FreemarkerPageFilter_applyDecorator: ";
if (velocityManager == null) {
throw new ServletException("Missing freemarker dependency");
}
--
To stop receiving notification emails like this one, please contact
yasserzamani@apache.org.