diff --git a/core/src/main/java/org/apache/struts2/components/Anchor.java b/core/src/main/java/org/apache/struts2/components/Anchor.java index 6bda43f209..c83b904256 100644 --- a/core/src/main/java/org/apache/struts2/components/Anchor.java +++ b/core/src/main/java/org/apache/struts2/components/Anchor.java @@ -117,7 +117,7 @@ protected void evaluateExtraParams() { @Inject(StrutsConstants.STRUTS_URL_INCLUDEPARAMS) public void setUrlIncludeParams(String urlIncludeParams) { - urlProvider.setUrlIncludeParams(urlIncludeParams); + urlProvider.setUrlIncludeParams(urlIncludeParams); } @Inject @@ -126,7 +126,7 @@ public void setUrlRenderer(UrlRenderer urlRenderer) { this.urlRenderer = urlRenderer; } - @Inject(required=false) + @Inject(required = false) public void setExtraParameterProvider(ExtraParameterProvider provider) { urlProvider.setExtraParameterProvider(provider); } @@ -147,7 +147,7 @@ public boolean end(Writer writer, String body) { evaluateParams(); try { addParameter("body", body); - mergeTemplate(writer, buildTemplateName(template, getDefaultTemplate())); + mergeTemplate(writer, buildTemplateName(getTemplate(), getDefaultTemplate())); } catch (Exception e) { LOG.error("error when rendering", e); } finally { diff --git a/core/src/main/java/org/apache/struts2/components/Bean.java b/core/src/main/java/org/apache/struts2/components/Bean.java index db39cb16f5..8aae1c1f8b 100644 --- a/core/src/main/java/org/apache/struts2/components/Bean.java +++ b/core/src/main/java/org/apache/struts2/components/Bean.java @@ -18,11 +18,11 @@ */ package org.apache.struts2.components; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.struts2.ObjectFactory; import org.apache.struts2.inject.Inject; import org.apache.struts2.util.ValueStack; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; import org.apache.struts2.util.reflection.ReflectionProvider; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; @@ -36,10 +36,10 @@ * *

If the var attribute is set on the BeanTag, it will place the instantiated bean into the * stack's Context.

- * + *

* - * - * + *

+ *

* *