geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ecr...@apache.org
Subject svn commit: r608290 - /geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/GraphsBuilder.java
Date Thu, 03 Jan 2008 00:27:48 GMT
Author: ecraig
Date: Wed Jan  2 16:27:46 2008
New Revision: 608290

URL: http://svn.apache.org/viewvc?rev=608290&view=rev
Log:
GERONIMO-3726
monitoring plugin displays misleading warning message

Patch by Viet Nguyen

Modified:
    geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/GraphsBuilder.java

Modified: geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/GraphsBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/GraphsBuilder.java?rev=608290&r1=608289&r2=608290&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/GraphsBuilder.java
(original)
+++ geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/GraphsBuilder.java
Wed Jan  2 16:27:46 2008
@@ -142,9 +142,11 @@
                 TreeMap<Long, Long> snapshotList1 = mrc
                         .getSpecificStatistics(mBeanName, dataName1, snapCount,
                                 skipCount, showArchive);
-                TreeMap<Long, Long> snapshotList2 = mrc
-                        .getSpecificStatistics(mBeanName, dataName2, snapCount,
-                                skipCount, showArchive);
+                TreeMap<Long, Long> snapshotList2 = new TreeMap<Long, Long>();
+                // get the statistics for dataName2 if this graph has one
+                if(dataName2 != null && !dataName2.equals("null")) {
+                    mrc.getSpecificStatistics(mBeanName, dataName2, snapCount, skipCount,
showArchive);
+                }
                 // Check if snapshotList is empty
                 if (snapshotList1.size() == 0) {
                     snapshotList1.put(System.currentTimeMillis(), new Long(0));



Mime
View raw message