From commits-return-18741-archive-asf-public=cust-asf.ponee.io@struts.apache.org Tue Feb 11 07:00:11 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 1A9E218063F for ; Tue, 11 Feb 2020 08:00:10 +0100 (CET) Received: (qmail 35635 invoked by uid 500); 11 Feb 2020 07:00:10 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 35624 invoked by uid 99); 11 Feb 2020 07:00:10 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Feb 2020 07:00:10 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 0FF0785467; Tue, 11 Feb 2020 07:00:09 +0000 (UTC) Date: Tue, 11 Feb 2020 07:00:09 +0000 To: "commits@struts.apache.org" Subject: [struts] branch WW-5054-debug-browser updated: WW-5054 Uses action as a starting point for debugging MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <158140440980.7728.14035922061495774911@gitbox.apache.org> From: lukaszlenart@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: struts X-Git-Refname: refs/heads/WW-5054-debug-browser X-Git-Reftype: branch X-Git-Oldrev: 1a0ef45160eaf3e66d828dfa363a314e690b0249 X-Git-Newrev: 6046363046cea0bc73baa40370709285f1d69997 X-Git-Rev: 6046363046cea0bc73baa40370709285f1d69997 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 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; *
  • command - Tests an OGNL expression and returns the * string result. Only used by the OGNL console.
    • *
  • browser Shows field values of an object specified in the - * object parameter (#context by default). When the object + * object parameter (action by default). When the object * parameters is set, the '#' character needs to be escaped to '%23'. Like * debug=browser&object=%23parameters
    • * @@ -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);