[JBEAP-10415] When redirected to runtime page, some windows remain op…

…en in Web Console
hal · May 6, 2017 · 4c7c087 · 4c7c087
1 parent 0a8bd10
commit 4c7c087
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/gui/src/main/java/org/jboss/as/console/client/shared/subsys/activemq/ActivemqFinder.java b/gui/src/main/java/org/jboss/as/console/client/shared/subsys/activemq/ActivemqFinder.java
@@ -88,6 +88,7 @@ public interface MyView extends View {
     private final ResourceDescriptionRegistry descriptionRegistry;
     private final SecurityFramework securityFramework;
     private final StatementContext statementContext;
+    private final BootstrapContext bootstrapContext;
 
     private DefaultWindow providerDialog;
     private ProviderView providerView;
@@ -111,6 +112,7 @@ public ActivemqFinder(EventBus eventBus,
         this.securityFramework = securityFramework;
         this.statementContext = statementContext;
         this.providerView = new ProviderView(this);
+        this.bootstrapContext = bootstrapContext;
     }
 
     @Override
@@ -250,7 +252,7 @@ public void onSuccess(DMRResponse dmrResponse) {
                     Console.info(Console.MESSAGES
                             .successfullyModifiedMessagingProvider(provider.getName()));
                 }
-                loadProvider(provider.getName());
+                reloadProviderDialog(provider.getName());
             }
         });
     }
@@ -298,7 +300,7 @@ public void onSuccess(DMRResponse dmrResponse) {
                 } else {
                     Console.info(Console.MESSAGES
                             .successfullyModifiedMessagingProvider(resourceName));
-                    loadProvider(resourceName);
+                    reloadProviderDialog(resourceName);
                 }
             }
         });
@@ -321,7 +323,7 @@ public void onSuccess(DMRResponse dmrResponse) {
                     Console.error(Console.MESSAGES.failedToModifyMessagingProvider(resourceName), response.getFailureDescription());
                 } else {
                     Console.info(Console.MESSAGES.successfullyModifiedMessagingProvider(resourceName));
-                    loadProvider(resourceName); // refresh
+                    reloadProviderDialog(resourceName);
                 }
             }
         });
@@ -338,4 +340,11 @@ public void onLaunchProviderSettings(Property provider) {
 
         providerView.updateFrom(provider);
     }
+
+    private void reloadProviderDialog(String name) {
+        loadProvider(name);
+        if (!bootstrapContext.isStandalone()) {
+            providerDialog.hide();
+        }
+    }
 }