Author: hermanns
Date: Wed Sep 13 04:38:07 2006
New Revision: 442948

URL: http://svn.apache.org/viewvc?view=rev&rev=442948
Log:
ScopeInterceptor caches key in instance variable
o backport from WW 2.2.4

Issue Number: WW-1443

Modified:
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java?view=diff&rev=442948&r1=442947&r2=442948
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java
 Wed Sep 13 04:38:07 2006
@@ -183,9 +183,9 @@
     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;
     }


Reply via email to