[jboss-cvs] system2/src/main/org/jboss/system ...

[Scott Stark]

  User: starksm 
  Date: 06/07/13 18:59:37

  Modified:    src/main/org/jboss/system  ServiceMBeanSupport.java
  Log:
  Remove the log4j NDC usage
  
  Revision  Changes    Path
  1.3       +1 -27     system2/src/main/org/jboss/system/ServiceMBeanSupport.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServiceMBeanSupport.java
  ===================================================================
  RCS file: /cvsroot/jboss/system2/src/main/org/jboss/system/ServiceMBeanSupport.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- ServiceMBeanSupport.java	7 Jun 2005 21:31:23 -0000	1.2
  +++ ServiceMBeanSupport.java	13 Jul 2006 22:59:37 -0000	1.3
  @@ -17,7 +17,6 @@
   import javax.management.MalformedObjectNameException;
   import javax.management.ObjectName;
   
  -import org.apache.log4j.NDC;
   import org.jboss.logging.Logger;
   import org.jboss.mx.util.JBossNotificationBroadcasterSupport;
   
  @@ -35,7 +34,7 @@
    * @author Scott.Stark at jboss.org
    * @author <a href="mailto:andreas at jboss.org">Andreas Schaefer</a>
    * @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
   public class ServiceMBeanSupport
      extends JBossNotificationBroadcasterSupport
  @@ -229,7 +228,6 @@
      
      protected void jbossInternalCreate() throws Exception
      {
  -      NDC.push(getName());
         log.debug("Creating " + jbossInternalDescription());
         
         try
  @@ -242,11 +240,6 @@
            log.error("Initialization failed " + jbossInternalDescription(), e);
            throw e;
         }
  -      finally
  -      {
  -         NDC.pop();
  -         NDC.remove();
  -      }
   
         log.debug("Created " + jbossInternalDescription());
      }
  @@ -264,7 +257,6 @@
            new Integer(STOPPED), new Integer(STARTING));
         sendNotification(stateChange);
         log.debug("Starting " + jbossInternalDescription());
  -      NDC.push(getName());
   
         try
         {
  @@ -283,11 +275,6 @@
            log.error("Starting failed " + jbossInternalDescription(), e);
            throw e;
         }
  -      finally
  -      {
  -         NDC.pop();
  -         NDC.remove();
  -      }
   
         state = STARTED;
         now = System.currentTimeMillis();
  @@ -312,7 +299,6 @@
            new Integer(STARTED), new Integer(STOPPING));
         sendNotification(stateChange);
         log.debug("Stopping " + jbossInternalDescription());
  -      NDC.push(getName());
   
         try
         {
  @@ -331,11 +317,6 @@
            log.error("Stopping failed " + jbossInternalDescription(), e);
            return;
         }
  -      finally
  -      {
  -         NDC.pop();
  -         NDC.remove();
  -      }
         
         state = STOPPED;
         now = System.currentTimeMillis();
  @@ -356,8 +337,6 @@
         
         log.debug("Destroying " + jbossInternalDescription());
         
  -      NDC.push(getName());
  -      
         try
         {
            destroyService();
  @@ -366,11 +345,6 @@
         {
            log.error("Destroying failed " + jbossInternalDescription(), t);
         }
  -      finally
  -      {
  -         NDC.pop();
  -         NDC.remove();
  -      }
         state = DESTROYED;
         log.debug("Destroyed " + jbossInternalDescription());
      }