Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 7829 invoked from network); 5 Jan 2009 15:01:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Jan 2009 15:01:02 -0000 Received: (qmail 2499 invoked by uid 500); 5 Jan 2009 15:01:02 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 2450 invoked by uid 500); 5 Jan 2009 15:01:02 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 2441 invoked by uid 99); 5 Jan 2009 15:01:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jan 2009 07:01:02 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jan 2009 15:01:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7297F23889B7; Mon, 5 Jan 2009 07:00:41 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r731589 - in /geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console: Constants.java MonitoringPortlet.java Date: Mon, 05 Jan 2009 15:00:41 -0000 To: scm@geronimo.apache.org From: dwoods@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090105150041.7297F23889B7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dwoods Date: Mon Jan 5 07:00:40 2009 New Revision: 731589 URL: http://svn.apache.org/viewvc?rev=731589&view=rev Log: GERONIMO-4480 Trying to view a graph in the Monitoring portlet results in a NPE. Patch provided by Shawn Jiang (genspring). Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/Constants.java geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/Constants.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/Constants.java?rev=731589&r1=731588&r2=731589&view=diff ============================================================================== --- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/Constants.java (original) +++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/Constants.java Mon Jan 5 07:00:40 2009 @@ -21,8 +21,8 @@ package org.apache.geronimo.monitoring.console; /** - * @version $Rev:$ $Date:$ + * @version $Rev$ $Date$ */ public interface Constants { - static String DOJO_JS = "/dojo/dojo/dojo/dojo.js"; + static String DOJO_JS = "/dojo/dojo/dojo.js"; } Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java?rev=731589&r1=731588&r2=731589&view=diff ============================================================================== --- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java (original) +++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java Mon Jan 5 07:00:40 2009 @@ -297,6 +297,7 @@ pageView.include(request, response); } else if (action.equals("showAllViews")) { request.setAttribute("message", ""); + addAllViewsAttribute(request); viewViews.include(request, response); } else if (action.equals("showAllServers")) { request.setAttribute("message", "");