Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4F3D07C97 for ; Wed, 31 Aug 2011 16:02:26 +0000 (UTC) Received: (qmail 59497 invoked by uid 500); 31 Aug 2011 16:02:26 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 59455 invoked by uid 500); 31 Aug 2011 16:02:25 -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 59448 invoked by uid 99); 31 Aug 2011 16:02:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Aug 2011 16:02:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Wed, 31 Aug 2011 16:02:23 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 33CEF23888FD; Wed, 31 Aug 2011 16:02:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1163676 - /geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java Date: Wed, 31 Aug 2011 16:02:03 -0000 To: scm@geronimo.apache.org From: michaelfang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110831160203.33CEF23888FD@eris.apache.org> Author: michaelfang Date: Wed Aug 31 16:02:02 2011 New Revision: 1163676 URL: http://svn.apache.org/viewvc?rev=1163676&view=rev Log: GERONIMO-6136 Portlet WARModules is unavailable if any war with errors is deployed Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java?rev=1163676&r1=1163675&r2=1163676&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java (original) +++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java Wed Aug 31 16:02:02 2011 @@ -239,10 +239,12 @@ public class ConfigManagerPortlet extend AbstractName configObjName = Configuration.getConfigurationAbstractName(info.getConfigID()); boolean loaded = loadModule(configManager, configObjName); Configuration config = configManager.getConfiguration(info.getConfigID()); - for(Map.Entry entry : config.getGBeans().entrySet()) { - if(entry.getKey().getNameProperty(NameFactory.J2EE_TYPE).equals(NameFactory.WEB_MODULE)) { - details.getContextPaths().add((String)entry.getValue().getAttribute("contextPath")); - details.setDisplayName(((WebAppInfo)entry.getValue().getAttribute("webAppInfo")).displayName); + if (config != null) { + for(Map.Entry entry : config.getGBeans().entrySet()) { + if(entry.getKey().getNameProperty(NameFactory.J2EE_TYPE).equals(NameFactory.WEB_MODULE)) { + details.getContextPaths().add((String)entry.getValue().getAttribute("contextPath")); + details.setDisplayName(((WebAppInfo)entry.getValue().getAttribute("webAppInfo")).displayName); + } } }