[cvs] expresso commit by lhamel: cosmetic renaming var

[JCorporate Ltd]

Log Message:
-----------
cosmetic renaming var

Modified Files:
--------------
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller:
        DBController.java

Revision Data
-------------
Index: DBController.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DBController.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DBController.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DBController.java -u -r1.35 -r1.36
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DBController.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DBController.java
@@ -95,8 +95,7 @@
  * connect to a database, and how to read it's own security
  * information for each state
  */
-public abstract class DBController
-        extends Controller {
+public abstract class DBController extends Controller {
 
     private static final String CACHE_NAME = DBController.class + "securityCache"; // includes class name and hashcode
 
@@ -106,7 +105,10 @@
     private static final long CACHE_TTY = 60 * 1000 * 30;
 
     private static boolean listenersSetup = false;
-    private static Logger log = Logger.getLogger(DBController.class);
+    /**
+     * sLog for static methods in this class alone
+     */
+    private static Logger sLog = Logger.getLogger(DBController.class);
 
     /**
      *
@@ -142,8 +144,8 @@
             return;
         }
 
-        if (log.isDebugEnabled()) {
-            log.debug("Adding cached access for Group:'" + group + "' for state(s) '" +
+        if (sLog.isDebugEnabled()) {
+            sLog.debug("Adding cached access for Group:'" + group + "' for state(s) '" +
                     states + "' controller " + className);
         }
         if (!cs.existsCache(CACHE_NAME)) {
@@ -207,15 +209,15 @@
                     new ValidValue(group + "|" + className,
                             existing), CACHE_TTY);
 
-            if (log.isDebugEnabled()) {
-                log.debug("Cache updated for group '" + group + "', controller " +
+            if (sLog.isDebugEnabled()) {
+                sLog.debug("Cache updated for group '" + group + "', controller " +
                         className + ", permissions now '" + existing + "'");
             }
 
             return;
         } else {
-            if (log.isDebugEnabled()) {
-                log.debug("There was no existing security in cache");
+            if (sLog.isDebugEnabled()) {
+                sLog.debug("There was no existing security in cache");
             }
 
             cs.addItem(CACHE_NAME,
@@ -373,8 +375,8 @@
                     String sec = secVal.getDescription();
 
                     if (containsAllowedState(sec, newState)) {
-                        if (log.isDebugEnabled()) {
-                            log.debug("User '" + request.getUid() +
+                        if (sLog.isDebugEnabled()) {
+                            sLog.debug("User '" + request.getUid() +
                                     "' allowed state '" + newState +
                                     "' via cache");
                         }