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

[Scott Stark]

  User: starksm 
  Date: 06/07/13 19:01:31

  Modified:    src/main/org/jboss/system  ServiceController.java
  Log:
  Remove the log4j NDC usage
  
  Revision  Changes    Path
  1.4       +101 -130  system2/src/main/org/jboss/system/ServiceController.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServiceController.java
  ===================================================================
  RCS file: /cvsroot/jboss/system2/src/main/org/jboss/system/ServiceController.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- ServiceController.java	7 Jun 2005 21:31:23 -0000	1.3
  +++ ServiceController.java	13 Jul 2006 23:01:31 -0000	1.4
  @@ -28,7 +28,6 @@
   import javax.management.Notification;
   import javax.management.ObjectName;
   
  -import org.apache.log4j.NDC;
   import org.jboss.deployment.DeploymentException;
   import org.jboss.deployment.DeploymentInfo;
   import org.jboss.deployment.DeploymentState;
  @@ -49,7 +48,7 @@
    * @author <a href="mailto:d_jencks at users.sourceforge.net">David Jencks</a>
    * @author <a href="mailto:scott.stark at jboss.org">Scott Stark</a>
    * @author <a href="mailto:dimitris at jboss.org">Dimitris Andreadis</a>
  - * @version $Revision: 1.3 $ <p>
  + * @version $Revision: 1.4 $ <p>
    *
    * @jmx:mbean name="jboss.system:service=ServiceController"
    */
  @@ -228,18 +227,9 @@
         log.debug("Registering service " + serviceName);
         ServiceContext ctx = createServiceContext(serviceName);
         log.trace("Pushing NDC: " + ctx.objectName.toString());
  -      NDC.push(ctx.objectName.toString());
   
  -      try
  -      {
            register(ctx, depends);
         }
  -      finally
  -      {
  -         NDC.pop();
  -         NDC.remove();
  -      }
  -   }
   
      /**
       * Register the service context and its dependencies against the microkernel.
  @@ -288,10 +278,7 @@
         log.debug("Creating service " + serviceName);
         ServiceContext ctx = createServiceContext(serviceName);
         log.trace("Pushing NDC: " + ctx.objectName.toString());
  -      NDC.push(ctx.objectName.toString());
   
  -      try
  -      {
            // Register the context and its dependencies if necessary
            register(ctx, depends);
   
  @@ -354,12 +341,6 @@
            }
            tmp.clear();
         }
  -      finally
  -      {
  -         NDC.pop();
  -         NDC.remove();
  -      }
  -   }
   
      /**
       * Starts the indicated service
  @@ -374,10 +355,6 @@
   
         ServiceContext ctx = createServiceContext(serviceName);
   
  -      NDC.push(ctx.objectName.toString());
  -
  -      try
  -      {
            if (!installedServices.contains(ctx))
               installedServices.add(ctx);
   
  @@ -441,12 +418,6 @@
            }
            tmp.clear();
         }
  -      finally
  -      {
  -         NDC.pop();
  -         NDC.remove();
  -      }
  -   }
   
      /**
       * Stops and restarts the given service