Merge branch 'ticket_34826' into ts7.5

RestComm · Jan 19, 2018 · 8d47aca · 8d47aca
2 parents 7cf7a9d + fff5308
commit 8d47aca
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/core/domain/src/main/java/org/mobicents/smsc/domain/SmscManagement.java b/core/domain/src/main/java/org/mobicents/smsc/domain/SmscManagement.java
@@ -383,9 +383,13 @@ public void start() throws Exception {
 		this.smscPropertiesManagement.setPersistDir(this.persistDir);
 		this.smscPropertiesManagement.start();
 
-		ObjectName smscObjNname = new ObjectName(SmscManagement.JMX_DOMAIN + ":layer="
+		ObjectName smscObjName = new ObjectName(SmscManagement.JMX_DOMAIN + ":layer="
+                + JMX_LAYER_SMSC_MANAGEMENT + ",name=" + this.getName());
+        this.registerMBean(this, SmscManagementMBean.class, true, smscObjName);
+
+		ObjectName smscPropObjName = new ObjectName(SmscManagement.JMX_DOMAIN + ":layer="
 				+ JMX_LAYER_SMSC_PROPERTIES_MANAGEMENT + ",name=" + this.getName());
-		this.registerMBean(this.smscPropertiesManagement, SmscPropertiesManagementMBean.class, true, smscObjNname);
+		this.registerMBean(this.smscPropertiesManagement, SmscPropertiesManagementMBean.class, true, smscPropObjName);
 
         this.homeRoutingManagement = HomeRoutingManagement.getInstance(this.name);
         this.homeRoutingManagement.setPersistDir(this.persistDir);
@@ -531,9 +535,9 @@ public void stop() throws Exception {
         this.unregisterMbean(smscManagementObjName);
 
 		this.smscPropertiesManagement.stop();
-		ObjectName smscObjNname = new ObjectName(SmscManagement.JMX_DOMAIN + ":layer="
+		ObjectName smscPropObjName = new ObjectName(SmscManagement.JMX_DOMAIN + ":layer="
 				+ JMX_LAYER_SMSC_PROPERTIES_MANAGEMENT + ",name=" + this.getName());
-		this.unregisterMbean(smscObjNname);
+		this.unregisterMbean(smscPropObjName);
 
         this.homeRoutingManagement.stop();
         ObjectName hrObjNname = new ObjectName(SmscManagement.JMX_DOMAIN + ":layer=" + JMX_LAYER_HOME_ROUTING_MANAGEMENT + ",name=" + this.getName());