[Aplaws-commit] r794 - ccm-ldn-shortcuts/trunk/src/com/arsdigita/london/shortcuts

[<fa...@vh...>]

Author: fabrice
Date: 2005-09-12 17:06:53 +0200 (Mon, 12 Sep 2005)
New Revision: 794

Modified:
   ccm-ldn-shortcuts/trunk/src/com/arsdigita/london/shortcuts/Shortcut.java
   ccm-ldn-shortcuts/trunk/src/com/arsdigita/london/shortcuts/ShortcutFilter.java
   ccm-ldn-shortcuts/trunk/src/com/arsdigita/london/shortcuts/ShortcutUtil.java
   ccm-ldn-shortcuts/trunk/src/com/arsdigita/london/shortcuts/ShortcutsConfig.java
Log:
Code layout and fix transaction close



Modified: ccm-ldn-shortcuts/trunk/src/com/arsdigita/london/shortcuts/Shortcut.java
===================================================================
--- ccm-ldn-shortcuts/trunk/src/com/arsdigita/london/shortcuts/Shortcut.java	2005-09-12 15:06:00 UTC (rev 793)
+++ ccm-ldn-shortcuts/trunk/src/com/arsdigita/london/shortcuts/Shortcut.java	2005-09-12 15:06:53 UTC (rev 794)
@@ -13,24 +13,21 @@
  *
  */
 
-
 package com.arsdigita.london.shortcuts;
 
-
 import com.arsdigita.db.Sequences;
 import com.arsdigita.domain.DataObjectNotFoundException;
 import com.arsdigita.domain.DomainObject;
+import com.arsdigita.persistence.DataCollection;
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.persistence.OID;
 import com.arsdigita.persistence.SessionManager;
+import com.arsdigita.persistence.Session;
+import com.arsdigita.util.UncheckedWrapperException;
 
 import java.math.BigDecimal;
-import com.arsdigita.persistence.DataCollection;
-import com.arsdigita.util.UncheckedWrapperException;
 import java.sql.SQLException;
-import com.arsdigita.persistence.Session;
 
-
 /**
  * A shortcut
  * @author <a href="mailto:tzu...@ar...">Tzu-Mainn Chen</a>
@@ -86,10 +83,8 @@
     public static ShortcutCollection retrieveAll() {
         Session session = SessionManager.getSession();
         DataCollection shortcuts = session.retrieve(BASE_DATA_OBJECT_TYPE);
-	
         shortcuts.addOrder(URL_KEY);
-	
-	return new ShortcutCollection(shortcuts);
+		return new ShortcutCollection(shortcuts);
     }
 
     public static Shortcut findByURL(String url)

Modified: ccm-ldn-shortcuts/trunk/src/com/arsdigita/london/shortcuts/ShortcutFilter.java
===================================================================
--- ccm-ldn-shortcuts/trunk/src/com/arsdigita/london/shortcuts/ShortcutFilter.java	2005-09-12 15:06:00 UTC (rev 793)
+++ ccm-ldn-shortcuts/trunk/src/com/arsdigita/london/shortcuts/ShortcutFilter.java	2005-09-12 15:06:53 UTC (rev 794)
@@ -16,20 +16,16 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-
 package com.arsdigita.london.shortcuts;
 
-import javax.servlet.FilterChain;
+import com.arsdigita.web.BaseFilter;
 
+import java.io.IOException;
+import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import java.io.IOException;
-
-import com.arsdigita.web.BaseFilter;
-
 import org.apache.log4j.Logger;
 
 public class ShortcutFilter extends BaseFilter {

Modified: ccm-ldn-shortcuts/trunk/src/com/arsdigita/london/shortcuts/ShortcutUtil.java
===================================================================
--- ccm-ldn-shortcuts/trunk/src/com/arsdigita/london/shortcuts/ShortcutUtil.java	2005-09-12 15:06:00 UTC (rev 793)
+++ ccm-ldn-shortcuts/trunk/src/com/arsdigita/london/shortcuts/ShortcutUtil.java	2005-09-12 15:06:53 UTC (rev 794)
@@ -15,10 +15,7 @@
 
 package com.arsdigita.london.shortcuts;
 
-
-
 import com.arsdigita.caching.CacheTable;
-
 import com.arsdigita.persistence.SessionManager;
 import com.arsdigita.persistence.TransactionContext;
 
@@ -27,7 +24,6 @@
 
 import org.apache.log4j.Logger;
 
-
 public class ShortcutUtil {
 
     private static final Logger s_log =
@@ -73,22 +69,31 @@
         
         try {
             s_remote.put("shortcuts", "shortcuts");
+            if (s_log.isDebugEnabled()) {
             s_log.debug("Actually repopulating the cache");
+            }
             s_cache.clear();
             
             ShortcutCollection shortcuts = Shortcut.retrieveAll();
             while (shortcuts.next()) {
                 Shortcut shortcut = shortcuts.getShortcut();
+                if (s_log.isDebugEnabled()) {
                 s_log.debug(shortcut.getUrlKey() + " -> " + shortcut.getRedirect());
+                }
                 s_cache.put(shortcut.getUrlKey().toLowerCase(), 
                             shortcut.getRedirect());
             }
-            if (s_log.isDebugEnabled()) {
+
+            // only commit the Txn if we started it
+            if (doTxn) {
+                if (s_log.isDebugEnabled()) {
                 s_log.debug("Committing DB transaction");
             }
             txn.commitTxn();
+            }
+
         } finally {
-            if (txn.inTxn() && doTxn) {
+            if (doTxn && txn.inTxn()) {
                 if (s_log.isDebugEnabled()) {
                     s_log.debug("Aborting DB transaction");
                 }

Modified: ccm-ldn-shortcuts/trunk/src/com/arsdigita/london/shortcuts/ShortcutsConfig.java
===================================================================
--- ccm-ldn-shortcuts/trunk/src/com/arsdigita/london/shortcuts/ShortcutsConfig.java	2005-09-12 15:06:00 UTC (rev 793)
+++ ccm-ldn-shortcuts/trunk/src/com/arsdigita/london/shortcuts/ShortcutsConfig.java	2005-09-12 15:06:53 UTC (rev 794)
@@ -19,6 +19,8 @@
 package com.arsdigita.london.shortcuts;
 
 import com.arsdigita.runtime.AbstractConfig;
+import com.arsdigita.util.parameter.IntegerParameter;
+import com.arsdigita.util.parameter.Parameter;
 
 import org.apache.log4j.Logger;
 
@@ -33,6 +35,7 @@
  * @version $Id$
  */
 public final class ShortcutsConfig extends AbstractConfig {
+
     public static final String versionId =
         "$Id$" +
         "$Author$" +
@@ -43,5 +46,4 @@
     public ShortcutsConfig() {
         loadInfo();
     }
-
 }