struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [struts] branch WW-5054-debug-browser updated: WW-5054 Uses action as a starting point for debugging
Date Tue, 11 Feb 2020 07:00:09 GMT
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch WW-5054-debug-browser
in repository https://gitbox.apache.org/repos/asf/struts.git


The following commit(s) were added to refs/heads/WW-5054-debug-browser by this push:
     new 6046363  WW-5054 Uses action as a starting point for debugging
6046363 is described below

commit 6046363046cea0bc73baa40370709285f1d69997
Author: Lukasz Lenart <lukaszlenart@apache.org>
AuthorDate: Tue Feb 11 08:00:03 2020 +0100

    WW-5054 Uses action as a starting point for debugging
---
 .../apache/struts2/interceptor/debugging/DebuggingInterceptor.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java
b/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java
index 6791f81..10fdcf4 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java
@@ -71,7 +71,7 @@ import java.util.Map;
  * <li> <code>command</code> - Tests an OGNL expression and returns the
  * string result. Only used by the OGNL console.</li>
  * <li><code>browser</code> Shows field values of an object specified in
the
- * <code>object</code> parameter (#context by default). When the <code>object</code>
+ * <code>object</code> parameter (action by default). When the <code>object</code>
  * parameters is set, the '#' character needs to be escaped to '%23'. Like
  * debug=browser&amp;object=%23parameters</li>
  * </ul>
@@ -214,8 +214,9 @@ public class DebuggingInterceptor extends AbstractInterceptor {
                     new PreResultListener() {
                         public void beforeResult(ActionInvocation inv, String actionResult)
{
                             String rootObjectExpression = getParameter(OBJECT_PARAM);
-                            if (rootObjectExpression == null)
-                                rootObjectExpression = "top";
+                            if (rootObjectExpression == null) {
+                                rootObjectExpression = "action";
+                            }
                             String decorate = getParameter(DECORATE_PARAM);
                             ValueStack stack = (ValueStack) ctx.get(ActionContext.VALUE_STACK);
                             Object rootObject = stack.findValue(rootObjectExpression);


Mime
View raw message