cvs commit: incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service AbstractManagedObject.java

[dain]

dain        2003/11/07 09:47:14

  Modified:    modules/kernel/src/java/org/apache/geronimo/kernel/service
                        AbstractManagedObject.java
  Log:
  Expanded exception catch around notification registration.
  Optimize imports
  Reformat
  
  Revision  Changes    Path
  1.3       +3 -4      
incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service/AbstractManagedObject.java
  
  Index: AbstractManagedObject.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service/AbstractManagedObject.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractManagedObject.java        30 Oct 2003 07:47:04 -0000      1.2
  +++ AbstractManagedObject.java        7 Nov 2003 17:47:14 -0000       1.3
  @@ -60,7 +60,6 @@
   import java.util.Iterator;
   import java.util.List;
   import java.util.Set;
  -import javax.management.InstanceNotFoundException;
   import javax.management.ListenerNotFoundException;
   import javax.management.MBeanNotificationInfo;
   import javax.management.MBeanRegistration;
  @@ -89,13 +88,13 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.apache.geronimo.kernel.deployment.DependencyServiceMBean;
  +import 
org.apache.geronimo.kernel.deployment.service.MBeanRelationshipMetadata;
   import org.apache.geronimo.kernel.jmx.JMXUtil;
   import org.apache.geronimo.kernel.management.EventProvider;
   import org.apache.geronimo.kernel.management.ManagedObject;
   import org.apache.geronimo.kernel.management.NotificationType;
   import org.apache.geronimo.kernel.management.State;
   import org.apache.geronimo.kernel.management.StateManageable;
  -import 
org.apache.geronimo.kernel.deployment.service.MBeanRelationshipMetadata;
   
   /**
    * Abstract implementation of JSR77 StateManageable.
  @@ -475,7 +474,7 @@
               source = notification.getMBeanName();
               try {
                   server.addNotificationListener(source, this, 
NotificationType.NOTIFICATION_FILTER, null);
  -            } catch (InstanceNotFoundException e) {
  +            } catch (Exception e) {
                   // the instance died before we could get going... not a big 
deal
                   return;
               }