[pcgen-commit-svn] SF.net SVN: pcgen:[17501] Trunk/pcgen/code/src/java/pcgen/cdom/facet/ AbstractStorageFacet.java

[<jde...@us...>]

Revision: 17501
          http://pcgen.svn.sourceforge.net/pcgen/?rev=17501&view=rev
Author:   jdempsey
Date:     2012-09-28 12:10:16 +0000 (Fri, 28 Sep 2012)
Log Message:
-----------
Fix bug: Big performance drop in 5.17.18 when loading characters
Issue#: CODE-1683

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/cdom/facet/AbstractStorageFacet.java

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/facet/AbstractStorageFacet.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/cdom/facet/AbstractStorageFacet.java	2012-09-28 11:49:41 UTC (rev 17500)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/facet/AbstractStorageFacet.java	2012-09-28 12:10:16 UTC (rev 17501)
@@ -39,6 +39,8 @@
 	 * fields. 
 	 */
 	private Map<Class<?>, Object> lastCharacterDebugCache;
+	private DoubleKeyMap<CharID, Class<?>, Object> debugCache =
+			new DoubleKeyMap<CharID, Class<?>, Object>();
 	
 	/**
 	 * Copies the contents of the AbstractStorageFacet from one Player Character
@@ -90,7 +92,8 @@
 	 */
 	public Object removeCache(CharID id, Class<?> cl)
 	{
-		lastCharacterDebugCache = CACHE.getMapFor(id);
+		//lastCharacterDebugCache = CACHE.getMapFor(id);
+		debugCache = CACHE;
 		return CACHE.remove(id, cl);
 	}
 
@@ -112,7 +115,8 @@
 	 */
 	public Object setCache(CharID id, Class<?> cl, Object o)
 	{
-		lastCharacterDebugCache = CACHE.getMapFor(id);
+		//lastCharacterDebugCache = CACHE.getMapFor(id);
+		debugCache = CACHE;
 		return CACHE.put(id, cl, o);
 	}
 
@@ -131,7 +135,8 @@
 	 */
 	public Object getCache(CharID id, Class<?> cl)
 	{
-		lastCharacterDebugCache = CACHE.getMapFor(id);
+		//lastCharacterDebugCache = CACHE.getMapFor(id);
+		debugCache = CACHE;
 		return CACHE.get(id, cl);
 	}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.