[Hyperic-hq-discuss] hq r14461 - in trunk/src/org/hyperic/hq: application hibernate

[<sc...@hy...>]

Author: scottmf
Date: 2010-04-01 15:28:33 -0700 (Thu, 01 Apr 2010)
New Revision: 14461
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14461

Modified:
   trunk/src/org/hyperic/hq/application/HQApp.java
   trunk/src/org/hyperic/hq/hibernate/SessionManager.java
Log:
added better debugging to session ugrade debug log.  added a couple more readonly method signatures for scheduling and pingAgent

Modified: trunk/src/org/hyperic/hq/application/HQApp.java
===================================================================
--- trunk/src/org/hyperic/hq/application/HQApp.java	2010-04-01 21:25:46 UTC (rev 14460)
+++ trunk/src/org/hyperic/hq/application/HQApp.java	2010-04-01 22:28:33 UTC (rev 14461)
@@ -551,10 +551,14 @@
                                          SessionManager.currentSession());
                 }
 
+                final boolean debug = _log.isDebugEnabled();
                 if (!methIsReadOnly(methName)) {
-                    if (_log.isDebugEnabled()) {
-                        _log.debug("Upgrading session, due to [" + methName + 
-                                   "] on [" + className + "]");
+                    if (SessionManager.isReadWrite()) {
+                        if (debug) _log.debug("Session already upgraded, log is due to [" + methName + 
+                                              "] on [" + className + "]");
+                    } else {
+                        if (debug) _log.debug("Upgrading session, due to [" + methName + 
+                                              "] on [" + className + "]");
                     }
                     readWrite = true;
                     SessionManager.setSessionReadWrite();
@@ -605,15 +609,14 @@
         }
 
         private boolean methIsReadOnly(String methName) {
-            return methName.equals("runReport") || // ReportCenter
-                   methName.equals("setUserPrefsAfterCommit") ||
-                   // 'create' is part of EJB session bean creation
+            return // 'create' is part of EJB session bean creation
                    methName.equals("create") ||
                    methName.equals("disconnectAgent") ||
                    // recent alerts & indicators
                    methName.equals("fillAlertCount") ||
                    // gather agent metrics
                    methName.equals("handleMeasurementReport") ||
+                   methName.equals("initializeTriggers") ||
                    // For HQU methods
                    methName.equals("login") ||
                    methName.equals("loginGuest") ||
@@ -621,10 +624,15 @@
                    methName.equals("logsExistPerInterval") ||
                    // JMS
                    methName.equals("onMessage") ||
+                   methName.equals("pingAgent") ||
                    // masthead
                    methName.equals("resourcesExistOfType") ||
+                   // ReportCenter
+                   methName.equals("runReport") ||
+                   methName.equals("scheduleEnabled") ||
                    methName.equals("search") || 
-                   methName.equals("initializeTriggers") ||
+                   methName.equals("setUserPrefsAfterCommit") ||
+                   methName.equals("unschedule") ||
                    methName.startsWith("has") ||
                    methName.startsWith("are") ||
                    methName.startsWith("check") ||

Modified: trunk/src/org/hyperic/hq/hibernate/SessionManager.java
===================================================================
--- trunk/src/org/hyperic/hq/hibernate/SessionManager.java	2010-04-01 21:25:46 UTC (rev 14460)
+++ trunk/src/org/hyperic/hq/hibernate/SessionManager.java	2010-04-01 22:28:33 UTC (rev 14461)
@@ -118,6 +118,14 @@
         INSTANCE.setSessionReadWriteInternal();
     }
     
+    public static boolean isReadWrite() {
+        Session s = (Session)INSTANCE._sessions.get();
+        if (s != null && s.getFlushMode().equals(FlushMode.AUTO)) {
+            return true;
+        }
+        return false;
+    }
+    
     private void setSessionReadWriteInternal() {
         Session s = (Session)_sessions.get();