cvs commit: incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/jmx JMXDeploymentManager.java

[djencks]

djencks     2004/07/22 23:15:15

  Modified:    
modules/deployment/src/java/org/apache/geronimo/deployment/plugin/jmx
                        JMXDeploymentManager.java
  Log:
  Allow null module type
  
  Revision  Changes    Path
  1.9       +4 -4      
incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
  
  Index: JMXDeploymentManager.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JMXDeploymentManager.java 22 Jul 2004 03:24:45 -0000      1.8
  +++ JMXDeploymentManager.java 23 Jul 2004 06:15:15 -0000      1.9
  @@ -99,7 +99,7 @@
       public TargetModuleID[] getAvailableModules(final ModuleType moduleType, 
Target[] targetList) throws TargetException {
           ConfigFilter filter = new ConfigFilter() {
               public boolean accept(ConfigurationInfo info) {
  -                return info.getType() == 
ConfigurationModuleType.getFromValue(moduleType.getValue());
  +                return moduleType == null || info.getType() == 
ConfigurationModuleType.getFromValue(moduleType.getValue());
               }
           };
           return getModules(targetList, filter);
  @@ -108,7 +108,7 @@
       public TargetModuleID[] getNonRunningModules(final ModuleType 
moduleType, Target[] targetList) throws TargetException {
           ConfigFilter filter = new ConfigFilter() {
               public boolean accept(ConfigurationInfo info) {
  -                return info.getState() != State.RUNNING && info.getType() == 
ConfigurationModuleType.getFromValue(moduleType.getValue());
  +                return info.getState() != State.RUNNING && (moduleType == 
null || info.getType() == 
ConfigurationModuleType.getFromValue(moduleType.getValue()));
               }
           };
           return getModules(targetList, filter);
  @@ -117,7 +117,7 @@
       public TargetModuleID[] getRunningModules(final ModuleType moduleType, 
Target[] targetList) throws TargetException {
           ConfigFilter filter = new ConfigFilter() {
               public boolean accept(ConfigurationInfo info) {
  -                return info.getState() == State.RUNNING && info.getType() == 
ConfigurationModuleType.getFromValue(moduleType.getValue());
  +                return info.getState() == State.RUNNING && (moduleType == 
null || info.getType() == 
ConfigurationModuleType.getFromValue(moduleType.getValue()));
               }
           };
           return getModules(targetList, filter);