Bug 1659098 - Use profile address to enable-statics for ejb3 runtime

rhq-project · Apr 18, 2019 · 09bf1f2 · 09bf1f2
1 parent 5b0949f
commit 09bf1f2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/...ins/wfly-10/src/main/java/org/rhq/modules/plugins/wildfly10/Ejb3BeanRuntimeComponent.java b/...ins/wfly-10/src/main/java/org/rhq/modules/plugins/wildfly10/Ejb3BeanRuntimeComponent.java
@@ -322,14 +322,14 @@ private void ensureGlobalEJB3StatisticsEnabled() {
             return;
         }
         Address ejbAddress;
-
-        if ((BaseComponent<?>) getServerComponent() instanceof HostControllerComponent) {
-            ejbAddress = new Address(findManagedASServerComponent().getServerAddress());
-        } else {
-            ejbAddress = new Address(getServerComponent().getServerAddress());
-        }
-        ejbAddress.add("subsystem", "ejb3");
         try {
+            if ((BaseComponent<?>) getServerComponent() instanceof HostControllerComponent) {
+                ejbAddress = new Address(findManagedASServerComponent().getProfileAddress());
+            } else {
+                ejbAddress = new Address(getServerComponent().getServerAddress());
+            }
+            ejbAddress.add("subsystem", "ejb3");
+
             ejb3StatisticsEnabled = readAttribute(ejbAddress, "enable-statistics", Boolean.class);
             if (!Boolean.TRUE.equals(ejb3StatisticsEnabled)) {
                 getLog().debug("Enabling global EJB3 statistics");

diff --git a/...s/plugins/wfly-10/src/main/java/org/rhq/modules/plugins/wildfly10/ManagedASComponent.java b/...s/plugins/wfly-10/src/main/java/org/rhq/modules/plugins/wildfly10/ManagedASComponent.java
@@ -190,6 +190,13 @@ protected Address getServerAddress() {
         return serverAddress;
     }
 
+    protected Address getProfileAddress() throws Exception {
+        String group = this.pluginConfiguration.getSimpleValue("group");
+        Address groupAddress = new Address("server-group", group);
+        String profile = readAttribute(groupAddress, "profile");
+        return new Address("profile", profile);
+    }
+
     @Override
     protected String getSocketBindingGroup() {
         String socketBindingGroup;