r1157 - in xwiki/trunk/src/main/java/com/xpn/xwiki: cache/api cache/impl plugin

[Sergiu Dumitriu]

Author: sdumitriu
Date: 2006-08-17 13:01:14 +0200 (Thu, 17 Aug 2006)
New Revision: 1157

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/cache/api/XWikiCacheNeedsRefreshException.java
   xwiki/trunk/src/main/java/com/xpn/xwiki/cache/impl/OSCacheCache.java
   xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/XWikiDefaultPlugin.java
Log:


Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/cache/api/XWikiCacheNeedsRefreshException.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/cache/api/XWikiCacheNeedsRefreshException.java	2006-08-16 16:31:57 UTC (rev 1156)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/cache/api/XWikiCacheNeedsRefreshException.java	2006-08-17 11:01:14 UTC (rev 1157)
@@ -24,13 +24,18 @@
 import com.opensymphony.oscache.base.NeedsRefreshException;
 
 public class XWikiCacheNeedsRefreshException extends Exception {
-    protected Exception e;
+    protected Exception e;
+    protected Object expiredCacheContents;
 
     public XWikiCacheNeedsRefreshException(NeedsRefreshException e) {
         this.e = e;
+    }
+
+    public XWikiCacheNeedsRefreshException(NeedsRefreshException e, Object expiredCacheContents) {
+        this.e = e;
+        this.expiredCacheContents = expiredCacheContents;
     }
 
-
     /**
      * Returns the detail message string of this throwable.
      *

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/cache/impl/OSCacheCache.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/cache/impl/OSCacheCache.java	2006-08-16 16:31:57 UTC (rev 1156)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/cache/impl/OSCacheCache.java	2006-08-17 11:01:14 UTC (rev 1157)
@@ -1,22 +1,21 @@
 package com.xpn.xwiki.cache.impl;
 
-import java.util.Properties;
-import java.util.Map;
-import java.util.Collection;
 import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import com.opensymphony.oscache.base.Cache;
+import com.opensymphony.oscache.base.CacheEntry;
 import com.opensymphony.oscache.base.EntryRefreshPolicy;
 import com.opensymphony.oscache.base.NeedsRefreshException;
-import com.opensymphony.oscache.base.CacheEntry;
 import com.opensymphony.oscache.general.GeneralCacheAdministrator;
-import com.xpn.xwiki.cache.api.XWikiCache;
-import com.xpn.xwiki.cache.api.XWikiCacheNeedsRefreshException;
 import com.xpn.xwiki.XWiki;
 import com.xpn.xwiki.XWikiException;
+import com.xpn.xwiki.cache.api.XWikiCache;
+import com.xpn.xwiki.cache.api.XWikiCacheNeedsRefreshException;
 
 /**
  * Copyright 2006, XpertNet SARL, and individual contributors as indicated by
@@ -108,7 +107,7 @@
         }
         catch (NeedsRefreshException e)
         {
-            throw new XWikiCacheNeedsRefreshException(e);
+            throw new XWikiCacheNeedsRefreshException(e, e.getCacheContent());
         }
     }
 
@@ -120,7 +119,7 @@
         }
         catch (NeedsRefreshException e)
         {
-            throw new XWikiCacheNeedsRefreshException(e);
+            throw new XWikiCacheNeedsRefreshException(e, e.getCacheContent());
         }
     }
 

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/XWikiDefaultPlugin.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/XWikiDefaultPlugin.java	2006-08-16 16:31:57 UTC (rev 1156)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/XWikiDefaultPlugin.java	2006-08-17 11:01:14 UTC (rev 1157)
@@ -23,7 +23,6 @@
 package com.xpn.xwiki.plugin;
 
 import com.xpn.xwiki.XWikiContext;
-import com.xpn.xwiki.XWikiException;
 import com.xpn.xwiki.api.Api;
 import com.xpn.xwiki.doc.XWikiAttachment;