Skip to content

AMQ-9843 Handle InstanceNotFoundException during MBean unregistration… #1635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbonofre merged 1 commit into from
Feb 1, 2026
+18 −6
Merged

AMQ-9843 Handle InstanceNotFoundException during MBean unregistration… #1635

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,16 @@ public void stop() throws Exception {
// unregister the mbeans we have registered
if (mbeanServer != null) {
for (Map.Entry<ObjectName, ObjectName> entry : registeredMBeanNames.entrySet()) {
ObjectName actualName = entry.getValue();
final ObjectName actualName = entry.getValue();
if (actualName != null && beanServer.isRegistered(actualName)) {
LOG.debug("Unregistering MBean {}", actualName);
mbeanServer.unregisterMBean(actualName);
try {
LOG.debug("Unregistering MBean {}", actualName);
mbeanServer.unregisterMBean(actualName);
} catch (javax.management.InstanceNotFoundException e) {
// Ignore - the MBean was already unregistered (likely by advisory cleanup)
// This is a benign race condition during shutdown
LOG.trace("MBean already unregistered: {}", actualName);
}
}
}
}
Expand Down Expand Up @@ -449,10 +455,16 @@ public ObjectInstance getObjectInstance(ObjectName name) throws InstanceNotFound
* Unregister an MBean
*/
public void unregisterMBean(ObjectName name) throws JMException {
ObjectName actualName = this.registeredMBeanNames.get(name);
final ObjectName actualName = this.registeredMBeanNames.get(name);
if (beanServer != null && actualName != null && beanServer.isRegistered(actualName) && this.registeredMBeanNames.remove(name) != null) {
LOG.debug("Unregistering MBean {}", actualName);
beanServer.unregisterMBean(actualName);
try {
LOG.debug("Unregistering MBean {}", actualName);
beanServer.unregisterMBean(actualName);
} catch (javax.management.InstanceNotFoundException e) {
// Ignore - the MBean was already unregistered (race condition during concurrent cleanup)
// This is benign since the MBean is already gone, which is what we wanted
LOG.trace("MBean already unregistered: {}", actualName);
}
}
}

Expand Down