svn commit: r1307614 - in /struts/struts2/trunk: core/src/main/java/org/apache/struts2/views/freemarker/ plugins/config-browser/src/main/resources/config-browser/
Author: lukaszlenart
Date: Fri Mar 30 21:04:33 2012
New Revision: 1307614
URL: http://svn.apache.org/viewvc?rev=1307614&view=rev
Log:
WW-3750 reduces scope of cashing
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java
struts/struts2/trunk/plugins/config-browser/src/main/resources/config-browser/actionNames.ftl
struts/struts2/trunk/plugins/config-browser/src/main/resources/config-browser/page-header.ftl
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java?rev=1307614&r1=1307613&r2=1307614&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java
Fri Mar 30 21:04:33 2012
@@ -32,7 +32,6 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpSession;
import java.util.HashMap;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
/**
@@ -52,8 +51,7 @@ public class ScopesHashModel extends Sim
private ServletContext servletContext;
private ValueStack stack;
private final Map unlistedModels = new
HashMap();
-private final Map stackCache = new
ConcurrentHashMap();
-private static final Object NULL_OBJECT = new Object();
+private volatile Object parametersCache;
public ScopesHashModel(ObjectWrapper objectWrapper, ServletContext
context, HttpServletRequest request, ValueStack stack) {
super(objectWrapper);
@@ -143,21 +141,15 @@ public class ScopesHashModel extends Sim
}
private Object findValueOnStack(final String key) {
-if (this.stackCache.containsKey(key)) {
-final Object value = this.stackCache.get(key);
-if (value == NULL_OBJECT) {
-return null;
-}
-return value;
-}
-
-final Object value = this.stack.findValue(key);
-if (value == null) {
-this.stackCache.put(key, NULL_OBJECT);
-} else {
-this.stackCache.put(key, value);
+if ("parameters".equals(key)) {
+if (parametersCache != null) {
+return parametersCache;
+}
+Object parametersLocal = stack.findValue(key);
+parametersCache = parametersLocal;
+return parametersLocal;
}
-return value;
+return stack.findValue(key);
}
public void put(String string, boolean b) {
Modified:
struts/struts2/trunk/plugins/config-browser/src/main/resources/config-browser/actionNames.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/resources/config-browser/actionNames.ftl?rev=1307614&r1=1307613&r2=1307614&view=diff
==
---
struts/struts2/trunk/plugins/config-browser/src/main/resources/config-browser/actionNames.ftl
(original)
+++
struts/struts2/trunk/plugins/config-browser/src/main/resources/config-browser/actionNames.ftl
Fri Mar 30 21:04:33 2012
@@ -32,7 +32,7 @@
<@s.param name="namespace">${namespace}
<@s.param name="actionName">${name}
-<@s.a href="%{showConfig}">${name}
+${name}
Modified:
struts/struts2/trunk/plugins/config-browser/src/main/resources/config-browser/page-header.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/resources/config-browser/page-header.ftl?rev=1307614&r1=1307613&r2=1307614&view=diff
==
---
struts/struts2/trunk/plugins/config-browser/src/main/resources/config-browser/page-header.ftl
(original)
+++
struts/struts2/trunk/plugins/config-browser/src/main/resources/config-browser/page-header.ftl
Fri Mar 30 21:04:33 2012
@@ -69,7 +69,7 @@
<@s.url var="namespaceLink" action="actionNames"
includeParams="none">
<@s.param
name="namespace">${namespace}
-<@s.a href="%{namespaceLink}"><#if namespace ==
""> default <#else> ${namespace}
+<#if namespace == "">
default <#else> ${namespace}
@@ -84,7 +84,7 @@
<@s.param
name="namespace">${namespace}
<@s.param name="actionName">${name}
-<@s.a href
svn commit: r1307617 - /struts/struts2/trunk/pom.xml
Author: lukaszlenart Date: Fri Mar 30 21:13:48 2012 New Revision: 1307617 URL: http://svn.apache.org/viewvc?rev=1307617&view=rev Log: WW-3781 upgrades XStream to 1.4.2 Modified: struts/struts2/trunk/pom.xml Modified: struts/struts2/trunk/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=1307617&r1=1307616&r2=1307617&view=diff == --- struts/struts2/trunk/pom.xml (original) +++ struts/struts2/trunk/pom.xml Fri Mar 30 21:13:48 2012 @@ -665,7 +665,7 @@ com.thoughtworks.xstream xstream -1.2.2 +1.4.2
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Bigtop (incubating) (https://cwiki.apache.org/confluence/display/BIGTOP) Pages - How to install Hadoop distribution from Bigtop edited by do...@stanfordalumni.org (10:54 PM) https://cwiki.apache.org/confluence/display/BIGTOP/How+to+install+Hadoop+distribution+from+Bigtop Apache Buildr (https://cwiki.apache.org/confluence/display/BUILDR) Pages - tetst created by crysmgl...@yahoo.com (02:21 AM) https://cwiki.apache.org/confluence/display/BUILDR/tetst Apache DeltaSpike (https://cwiki.apache.org/confluence/display/DeltaSpike) Pages - Exception Control Drafts created by gpetracek (05:09 AM) https://cwiki.apache.org/confluence/display/DeltaSpike/Exception+Control+Drafts Security Module Drafts edited by gpetracek (04:39 AM) https://cwiki.apache.org/confluence/display/DeltaSpike/Security+Module+Drafts Apache Flex (https://cwiki.apache.org/confluence/display/FLEX) Pages - Getting Started edited by mheidegger (10:49 PM) https://cwiki.apache.org/confluence/display/FLEX/Getting+Started Apache HCatalog (https://cwiki.apache.org/confluence/display/HCATALOG) Pages - Design Document - Java APIs for HCatalog DDL Commands edited by avand...@yahoo-inc.com (05:13 PM) https://cwiki.apache.org/confluence/display/HCATALOG/Design+Document+-+Java+APIs+for+HCatalog+DDL+Commands Apache Jackrabbit (https://cwiki.apache.org/confluence/display/JCR) Pages - Creating Releases edited by alex.parvulescu (09:08 AM) https://cwiki.apache.org/confluence/display/JCR/Creating+Releases Apache Kafka (https://cwiki.apache.org/confluence/display/KAFKA) Pages - Consumer API changes created by jjko...@gmail.com (06:38 PM) https://cwiki.apache.org/confluence/display/KAFKA/Consumer+API+changes Apache ActiveMQ NMS (https://cwiki.apache.org/confluence/display/NMS) Pages - ActiveMQ URI Configuration edited by tabish121 (10:19 AM) https://cwiki.apache.org/confluence/display/NMS/ActiveMQ+URI+Configuration ActiveMQ Async Sends edited by tabish121 (10:17 AM) https://cwiki.apache.org/confluence/display/NMS/ActiveMQ+Async+Sends OFBiz Project Administration Workspace (https://cwiki.apache.org/confluence/display/OFBADMIN) Pages - Mini-language Reference edited by adrianc (02:51 PM) https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference OFBiz (Open For Business) Project Open Wiki (https://cwiki.apache.org/confluence/display/OFBIZ) Pages - Dictionary for translations to German edited by chrisg (06:47 AM) https://cwiki.apache.org/confluence/display/OFBIZ/Dictionary+for+translations+to+German Apache OpenOffice Community (https://cwiki.apache.org/confluence/display/OOOUSERS) Pages - Bundled Writing Aids edited by af (09:37 AM) https://cwiki.apache.org/confluence/display/OOOUSERS/Bundled+Writing+Aids Project Reporting edited by liushenf (05:44 AM) https://cwiki.apache.org/confluence/display/OOOUSERS/Project+Reporting Apache Qpid (https://cwiki.apache.org/confluence/display/qpid) Pages - Qpid Java Broker Statistics edited by k-wall (04:52 AM) https://cwiki.apache.org/confluence/display/qpid/Qpid+Java+Broker+Statistics Apache Struts 2 Plugin Registry (https://cwiki.apache.org/confluence/display/S2PLUGINS) Pages - Bootstrap Plugin edited by jogep (03:39 AM) https://cwiki.apache.org/confluence/display/S2PLUGINS/Bootstrap+Plugin Change your notification preferences: https://cwiki.apache.org/confluence/users/viewnotifications.action
