Scarab commit: svn commit: r10449 - trunk/src/java/org/tigris/scarab/om

Author: ronvoe122
Date: 2007-06-10 06:53:27-0700
New Revision: 10449

Modified:
   trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java
   trunk/src/java/org/tigris/scarab/om/ModuleManager.java

Log:
[SCB1691] switch the cache from ScarabCache to MethodResultCache in AbstractScarabModule.getAllRModuleOptions.
Reduces the number of db queries when viewing the option attribute values of an issue (because the ScarabCache is cleared before each Request).

Modified: trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java?view=diff&rev=10449&p1=trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java&p2=trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java&r1=10448&r2=10449
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java	(original)
+++ trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java	2007-06-10 06:53:27-0700
@@ -1254,7 +1254,7 @@
         }
 
         List rModOpts = null;
-        Object obj = ScarabCache.get(this, GET_ALL_R_MODULE_OPTIONS, 
+        Object obj = getMethodResult().get(this, GET_ALL_R_MODULE_OPTIONS, 
                                      attribute, issueType); 
         if (obj == null) 
         {        
@@ -1283,7 +1283,7 @@
                 crit.addAscendingOrderByColumn(RModuleOptionPeer.DISPLAY_VALUE);
                 rModOpts = getRModuleOptions(crit);
             }
-            ScarabCache.put(rModOpts, this, GET_ALL_R_MODULE_OPTIONS, 
+            getMethodResult().put(rModOpts, this, GET_ALL_R_MODULE_OPTIONS, 
                             attribute, issueType); 
         }
         else 

Modified: trunk/src/java/org/tigris/scarab/om/ModuleManager.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/ModuleManager.java?view=diff&rev=10449&p1=trunk/src/java/org/tigris/scarab/om/ModuleManager.java&p2=trunk/src/java/org/tigris/scarab/om/ModuleManager.java&r1=10448&r2=10449
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/ModuleManager.java	(original)
+++ trunk/src/java/org/tigris/scarab/om/ModuleManager.java	2007-06-10 06:53:27-0700
@@ -220,6 +220,8 @@
                 {
                     getMethodResult().removeAll(obj, 
                         AbstractScarabModule.GET_LEAF_R_MODULE_OPTIONS);
+                    getMethodResult().removeAll(obj, 
+                            AbstractScarabModule.GET_ALL_R_MODULE_OPTIONS);
                 }
             }
             catch(TorqueException e)