Some small logging issues.

wfink · Mar 6, 2012 · 6d349f1 · 6d349f1
1 parent b7496dc
commit 6d349f1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/logging/src/main/java/org/jboss/as/logging/handlers/HandlerDisable.java b/logging/src/main/java/org/jboss/as/logging/handlers/HandlerDisable.java
@@ -25,14 +25,14 @@
 import org.jboss.as.controller.OperationContext;
 import org.jboss.as.controller.OperationStepHandler;
 import org.jboss.as.controller.PathAddress;
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
-
 import org.jboss.as.logging.util.LogServices;
 import org.jboss.dmr.ModelNode;
 import org.jboss.msc.service.AbstractServiceListener;
 import org.jboss.msc.service.ServiceController;
 import org.jboss.msc.service.ServiceRegistry;
 
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
+
 /**
  * Operation responsible for disabling a logging handler.
  *
@@ -56,8 +56,11 @@ public void listenerAdded(ServiceController<?> serviceController) {
                                 serviceController.setMode(ServiceController.Mode.NEVER);
                             }
 
-                            public void serviceStopped(ServiceController<?> serviceController) {
-                                context.completeStep();
+                            @Override
+                            public void transition(ServiceController<?> serviceController, ServiceController.Transition transition) {
+                                if (transition == ServiceController.Transition.STOPPING_to_DOWN) {
+                                    context.completeStep();
+                                }
                             }
                         });
                     } else {

diff --git a/logging/src/main/java/org/jboss/as/logging/handlers/HandlerEnable.java b/logging/src/main/java/org/jboss/as/logging/handlers/HandlerEnable.java
@@ -25,14 +25,14 @@
 import org.jboss.as.controller.OperationContext;
 import org.jboss.as.controller.OperationStepHandler;
 import org.jboss.as.controller.PathAddress;
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
-
 import org.jboss.as.logging.util.LogServices;
 import org.jboss.dmr.ModelNode;
 import org.jboss.msc.service.AbstractServiceListener;
 import org.jboss.msc.service.ServiceController;
 import org.jboss.msc.service.ServiceRegistry;
 
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
+
 /**
  * Operation responsible for enabling a logging handler.
  *
@@ -56,8 +56,11 @@ public void listenerAdded(ServiceController<?> serviceController) {
                                 serviceController.setMode(ServiceController.Mode.ACTIVE);
                             }
 
-                            public void serviceStarted(ServiceController<?> serviceController) {
-                                context.completeStep();
+                            @Override
+                            public void transition(ServiceController<?> serviceController, ServiceController.Transition transition) {
+                                if (transition == ServiceController.Transition.STARTING_to_UP) {
+                                    context.completeStep();
+                                }
                             }
                         });
                     } else {

diff --git a/logging/src/main/java/org/jboss/as/logging/handlers/custom/CustomHandlerService.java b/logging/src/main/java/org/jboss/as/logging/handlers/custom/CustomHandlerService.java
@@ -41,8 +41,8 @@
 import java.util.logging.Handler;
 import java.util.logging.Level;
 
-import static org.jboss.as.logging.handlers.custom.PropertiesConfigurator.setProperties;
 import static org.jboss.as.logging.LoggingMessages.MESSAGES;
+import static org.jboss.as.logging.handlers.custom.PropertiesConfigurator.setProperties;
 
 /**
  * Service for custom handlers.
@@ -96,7 +96,7 @@ public synchronized void start(final StartContext context) throws StartException
             throw MESSAGES.cannotAccessClass(e, className);
         }
         if (filter != null) handler.setFilter(filter);
-        formatterSpec.apply(handler);
+        if (formatterSpec != null) formatterSpec.apply(handler);
         if (level != null) handler.setLevel(level);
         try {
             handler.setEncoding(encoding);