[AS7-6113] call context.revertReloadRequired() in rollbackRuntime() methods

ropalka · bstansberry · commit d2bf69b944ab · 2012-12-12T16:25:35.000-06:00
diff --git a/webservices/server-integration/src/main/java/org/jboss/as/webservices/dmr/EndpointConfigAdd.java b/webservices/server-integration/src/main/java/org/jboss/as/webservices/dmr/EndpointConfigAdd.java
@@ -53,6 +53,14 @@ protected void populateModel(final ModelNode operation, final ModelNode model) t
         // does nothing
     }
 
+    @Override
+    protected void rollbackRuntime(final OperationContext context, final ModelNode operation, final ModelNode model, final List<ServiceController<?>> controllers) {
+        super.rollbackRuntime(context, operation, model, controllers);
+        if (!context.isBooting()) {
+            context.revertReloadRequired();
+        }
+    }
+
     @Override
     protected void performRuntime(final OperationContext context, final ModelNode operation, final ModelNode model, final ServiceVerificationHandler verificationHandler, final List<ServiceController<?>> newControllers) throws OperationFailedException {
         final ServerConfig config = getServerConfig(context);
diff --git a/webservices/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerAdd.java b/webservices/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerAdd.java
@@ -53,6 +53,14 @@ private HandlerAdd() {
         // forbidden instantiation
     }
 
+    @Override
+    protected void rollbackRuntime(final OperationContext context, final ModelNode operation, final ModelNode model, final List<ServiceController<?>> controllers) {
+        super.rollbackRuntime(context, operation, model, controllers);
+        if (!context.isBooting()) {
+            context.revertReloadRequired();
+        }
+    }
+
     @Override
     protected void performRuntime(final OperationContext context, final ModelNode operation, final ModelNode model, final ServiceVerificationHandler verificationHandler, final List<ServiceController<?>> newControllers) throws OperationFailedException {
         final ServerConfig config = getServerConfig(context);
diff --git a/webservices/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerChainAdd.java b/webservices/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerChainAdd.java
@@ -53,6 +53,14 @@ private HandlerChainAdd() {
         // forbidden instantiation
     }
 
+    @Override
+    protected void rollbackRuntime(final OperationContext context, final ModelNode operation, final ModelNode model, final List<ServiceController<?>> controllers) {
+        super.rollbackRuntime(context, operation, model, controllers);
+        if (!context.isBooting()) {
+            context.revertReloadRequired();
+        }
+    }
+
     @Override
     protected void performRuntime(final OperationContext context, final ModelNode operation, final ModelNode model, final ServiceVerificationHandler verificationHandler, final List<ServiceController<?>> newControllers) throws OperationFailedException {
         final ServerConfig config = getServerConfig(context);
diff --git a/webservices/server-integration/src/main/java/org/jboss/as/webservices/dmr/PropertyAdd.java b/webservices/server-integration/src/main/java/org/jboss/as/webservices/dmr/PropertyAdd.java
@@ -49,6 +49,14 @@ private PropertyAdd() {
         // forbidden instantiation
     }
 
+    @Override
+    protected void rollbackRuntime(final OperationContext context, final ModelNode operation, final ModelNode model, final List<ServiceController<?>> controllers) {
+        super.rollbackRuntime(context, operation, model, controllers);
+        if (!context.isBooting()) {
+            context.revertReloadRequired();
+        }
+    }
+
     @Override
     protected void performRuntime(final OperationContext context, final ModelNode operation, final ModelNode model, final ServiceVerificationHandler verificationHandler, final List<ServiceController<?>> newControllers) throws OperationFailedException {
         final ServerConfig config = getServerConfig(context);
