svn commit: r499886 - /geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java

[pm...@apache.org]

Author: pmcmahan
Date: Thu Jan 25 10:32:14 2007
New Revision: 499886

URL: http://svn.apache.org/viewvc?view=rev&rev=499886
Log:
GERONIMO-2728 prevent spurious error message from ConfigManagerPortlet caused by trying
to discover the parent and child relationships for a module that has unsatisfied dependencies
in the server.

Modified:
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java?view=diff&rev=499886&r1=499885&r2=499886
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java Thu Jan 25 10:32:14 2007
@@ -48,6 +48,7 @@
 import org.apache.geronimo.kernel.config.NoSuchConfigException;
 import org.apache.geronimo.kernel.management.State;
 import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.kernel.repository.MissingDependencyException;
 import org.apache.geronimo.management.geronimo.WebModule;
 
 public class ConfigManagerPortlet extends BasePortlet {
@@ -167,16 +168,22 @@
                     boolean flag = false;
                     // Check if the configuration is loaded.  If not, load it to get information.
                     if(!kernel.isLoaded(configObjName)) {
-                        flag = true;
                         try {
                             configManager.loadConfiguration(configObjName.getArtifact());
+                            flag = true;
                         } catch (NoSuchConfigException e) {
                             // Should not occur
                             e.printStackTrace();
                         } catch (LifecycleException e) {
-                            // TODO Auto-generated catch block
-                            e.printStackTrace();
-                        }
+			    // config could not load because one or more of its dependencies
+			    // has been removed. cannot load the configuration in this case,
+			    // so don't rely on that technique to discover its parents or children
+			    if (e.getCause() instanceof MissingDependencyException) {
+				// do nothing
+			    } else {
+				e.printStackTrace();
+			    }
+			}
                     }
 
                     java.util.Set parents = depMgr.getParents(configObjName);