You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2007/12/11 18:24:32 UTC
svn commit: r603311 - in /cocoon/branches/BRANCH_2_1_X: ./
src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/
src/blocks/portal/java/org/apache/cocoon/portal/coplet/
Author: cziegeler
Date: Tue Dec 11 09:24:31 2007
New Revision: 603311
URL: http://svn.apache.org/viewvc?rev=603311&view=rev
Log:
Some memory consumption improvements for the user profiles
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/AbstractAspectalizable.java
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/AbstractAspectalizableDescription.java
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/MemoryAspectDataStore.java
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletBaseData.java
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletData.java
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java
cocoon/branches/BRANCH_2_1_X/status.xml
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/AbstractAspectalizable.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/AbstractAspectalizable.java?rev=603311&r1=603310&r2=603311&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/AbstractAspectalizable.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/AbstractAspectalizable.java Tue Dec 11 09:24:31 2007
@@ -81,7 +81,7 @@
public void addPersistentAspectData(String aspectName, Object data) {
if ( this.persistentDatas == null ) {
- this.persistentDatas = new HashMap();
+ this.persistentDatas = new HashMap(3);
}
this.persistentDatas.put(aspectName, data);
}
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/AbstractAspectalizableDescription.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/AbstractAspectalizableDescription.java?rev=603311&r1=603310&r2=603311&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/AbstractAspectalizableDescription.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/AbstractAspectalizableDescription.java Tue Dec 11 09:24:31 2007
@@ -34,7 +34,7 @@
public abstract class AbstractAspectalizableDescription
implements AspectalizableDescription {
- protected List aspects = new ArrayList();
+ protected List aspects = new ArrayList(3);
public List getAspectDescriptions() {
return this.aspects;
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/MemoryAspectDataStore.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/MemoryAspectDataStore.java?rev=603311&r1=603310&r2=603311&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/MemoryAspectDataStore.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/MemoryAspectDataStore.java Tue Dec 11 09:24:31 2007
@@ -16,6 +16,7 @@
*/
package org.apache.cocoon.portal.aspect.impl;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -41,11 +42,15 @@
/**
* Get the aspect map for an object
*/
- protected Map getMap(Aspectalizable owner) {
+ protected Map getMap(Aspectalizable owner, boolean create) {
Map result = (Map)this.objectMap.get(owner);
if ( result == null ) {
- result = new HashMap();
- this.objectMap.put(owner, result);
+ if ( create ) {
+ result = new HashMap(4);
+ this.objectMap.put(owner, result);
+ } else {
+ result = Collections.EMPTY_MAP;
+ }
}
return result;
}
@@ -54,14 +59,14 @@
* @see org.apache.cocoon.portal.aspect.AspectDataStore#getAspectData(org.apache.cocoon.portal.aspect.Aspectalizable, java.lang.String)
*/
public Object getAspectData(Aspectalizable owner, String aspectName) {
- return this.getMap(owner).get( aspectName );
+ return this.getMap(owner, false).get( aspectName );
}
/* (non-Javadoc)
* @see org.apache.cocoon.portal.aspect.AspectDataStore#setAspectData(org.apache.cocoon.portal.aspect.Aspectalizable, java.lang.String, java.lang.Object)
*/
public void setAspectData(Aspectalizable owner, String aspectName, Object data) {
- this.getMap(owner).put(aspectName, data);
+ this.getMap(owner, true).put(aspectName, data);
}
/* (non-Javadoc)
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletBaseData.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletBaseData.java?rev=603311&r1=603310&r2=603311&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletBaseData.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletBaseData.java Tue Dec 11 09:24:31 2007
@@ -29,7 +29,7 @@
*/
public final class CopletBaseData {
- private Map copletConfig = new HashMap();
+ private Map copletConfig = new HashMap(3);
private String id;
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletData.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletData.java?rev=603311&r1=603310&r2=603311&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletData.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletData.java Tue Dec 11 09:24:31 2007
@@ -43,7 +43,7 @@
protected CopletBaseData copletBaseData;
- protected Map attributes = new HashMap();
+ protected Map attributes = new HashMap(3);
protected String allowedRoles;
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java?rev=603311&r1=603310&r2=603311&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java Tue Dec 11 09:24:31 2007
@@ -42,10 +42,10 @@
protected CopletData copletData;
- protected Map attributes = new HashMap();
+ protected Map attributes = new HashMap(3);
/** Temporary attributes are not persisted */
- protected Map temporaryAttributes = new HashMap();
+ protected Map temporaryAttributes = new HashMap(3);
/** Portlet preferences */
protected PreferenceSetImpl preferences = new PreferenceSetImpl();
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/status.xml?rev=603311&r1=603310&r2=603311&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Tue Dec 11 09:24:31 2007
@@ -182,6 +182,9 @@
<changes>
<release version="2.1.11" date="TBD">
+ <action dev="CZ" type="fix">
+ Portal: Some memory consumption improvements for the user profiles.
+ </action>
<action dev="AG" type="update">
Core: Update xalan to 2.7.1.
</action>