[jbosscache-commits] JBoss Cache SVN: r5932 - core/trunk/src/main/java/org/jboss/cache/loader.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2008-06-03 05:07:23 -0400 (Tue, 03 Jun 2008)
New Revision: 5932

Modified:
   core/trunk/src/main/java/org/jboss/cache/loader/CacheLoaderManager.java
Log:
Changed preload prio

Modified: core/trunk/src/main/java/org/jboss/cache/loader/CacheLoaderManager.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/loader/CacheLoaderManager.java	2008-06-03 09:04:06 UTC (rev 5931)
+++ core/trunk/src/main/java/org/jboss/cache/loader/CacheLoaderManager.java	2008-06-03 09:07:23 UTC (rev 5932)
@@ -290,28 +290,32 @@
     *
     * @throws Exception
     */
+   @Start(priority = 50)
    public void preloadCache() throws CacheException
    {
-      if (config.getPreload() == null || config.getPreload().equals("")) return;
-      if (log.isDebugEnabled()) log.debug("preloading transient state from cache loader " + loader);
-      StringTokenizer st = new StringTokenizer(config.getPreload(), ",");
-      String tok;
-      Fqn fqn;
-      long start, stop, total;
-      start = System.currentTimeMillis();
-      while (st.hasMoreTokens())
+      if (loader != null)
       {
-         tok = st.nextToken();
-         fqn = Fqn.fromString(tok.trim());
-         if (log.isTraceEnabled()) log.trace("preloading " + fqn);
-         preload(fqn, true, true);
-      }
+         if (config.getPreload() == null || config.getPreload().equals("")) return;
+         if (log.isDebugEnabled()) log.debug("preloading transient state from cache loader " + loader);
+         StringTokenizer st = new StringTokenizer(config.getPreload(), ",");
+         String tok;
+         Fqn fqn;
+         long start, stop, total;
+         start = System.currentTimeMillis();
+         while (st.hasMoreTokens())
+         {
+            tok = st.nextToken();
+            fqn = Fqn.fromString(tok.trim());
+            if (log.isTraceEnabled()) log.trace("preloading " + fqn);
+            preload(fqn, true, true);
+         }
 
-      stop = System.currentTimeMillis();
-      total = stop - start;
-      if (log.isDebugEnabled())
-      {
-         log.debug("preloading transient state from cache loader was successful (in " + total + " milliseconds)");
+         stop = System.currentTimeMillis();
+         total = stop - start;
+         if (log.isDebugEnabled())
+         {
+            log.debug("preloading transient state from cache loader was successful (in " + total + " milliseconds)");
+         }
       }
    }
 
@@ -442,8 +446,6 @@
             loader.start();
 
             purgeLoaders(false);
-
-            preloadCache();
          }
          catch (Exception e)
          {