geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From michaelf...@apache.org
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 GMT
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<AbstractName, GBeanData> 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<AbstractName, GBeanData> 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);
+                                }
                             }
                         }
 



Mime
View raw message