[Aplaws-commit] r982 - releases/1.0.2/ccm-ldn-theme/src/com/arsdigita/london/theme/util

[<cl...@vh...>]

Author: clasohm
Date: 2005-11-08 17:18:30 +0100 (Tue, 08 Nov 2005)
New Revision: 982

Modified:
   releases/1.0.2/ccm-ldn-theme/src/com/arsdigita/london/theme/util/ThemeFileManager.java
Log:
merged fix for update of m_lastRunDate from trunk

Modified: releases/1.0.2/ccm-ldn-theme/src/com/arsdigita/london/theme/util/ThemeFileManager.java
===================================================================
--- releases/1.0.2/ccm-ldn-theme/src/com/arsdigita/london/theme/util/ThemeFileManager.java	2005-11-08 15:59:26 UTC (rev 981)
+++ releases/1.0.2/ccm-ldn-theme/src/com/arsdigita/london/theme/util/ThemeFileManager.java	2005-11-08 16:18:30 UTC (rev 982)
@@ -122,6 +122,13 @@
         s_log.info("Polling file every " + m_pollDelay + "s.");
          while ( (sleepSeconds(m_pollDelay) || m_ignoreInterrupt)
                  && m_keepWatchingFiles ) {
+        	 // Get the last run date before we do anything,
+        	 // so we can be sure that we do not miss any themes 
+        	 // published while we run. But only store it after 
+        	 // we have processed all themes, because it will be 
+        	 // used in ThemePublishedFileManager.updateTheme().
+             Date lastRunDate = new Date();
+
              TransactionContext txn = 
                  SessionManager.getSession().getTransactionContext();
 
@@ -138,6 +145,8 @@
                  if (startedTransaction) {
                      txn.commitTxn();
                  }
+                 
+                 m_lastRunDate = lastRunDate;
              } catch (Exception e) {
                  s_log.warn("Ignoring uncaught exception", e);
              } finally {
@@ -287,7 +296,6 @@
                 }
             }
         }
-        m_lastRunDate = new Date();
     }