From b21dbe75d3f6925b0abf4ea188cb08cedce605d3 Mon Sep 17 00:00:00 2001 From: Rainer Hermanns Date: Wed, 13 Sep 2006 11:38:07 +0000 Subject: [PATCH] ScopeInterceptor caches key in instance variable o backport from WW 2.2.4 Issue Number: WW-1443 git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@442948 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/struts2/interceptor/ScopeInterceptor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java index c5a68588a..7541e2038 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java @@ -183,9 +183,9 @@ public class ScopeInterceptor extends AbstractInterceptor implements PreResultLi private String getKey(ActionInvocation invocation) { ActionProxy proxy = invocation.getProxy(); if (key == null || "CLASS".equals(key)) { - key = "struts.ScopeInterceptor:" + proxy.getAction().getClass(); + return "struts.ScopeInterceptor:" + proxy.getAction().getClass(); } else if ("ACTION".equals(key)) { - key = "struts.ScopeInterceptor:" + proxy.getNamespace() + ":" + proxy.getActionName(); + return "struts.ScopeInterceptor:" + proxy.getNamespace() + ":" + proxy.getActionName(); } return key; }