Bug 1259554 - Changing the Storage Node JMX port does not update the JMX

connection URL

Fix upgrade facet impl. of StorageNodeDiscoveryComponent. We're now able to
detect JMX port change at agent/pc startup time

modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeDiscoveryComponent.java

@@ -37,6 +37,7 @@
 import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
 import org.rhq.core.pluginapi.upgrade.ResourceUpgradeContext;
 import org.rhq.plugins.cassandra.CassandraNodeDiscoveryComponent;
+import org.rhq.plugins.jmx.JMXDiscoveryComponent;
 
 /**
  * @author Stefan Negrea
@@ -129,6 +130,23 @@ public ResourceUpgradeReport upgrade(ResourceUpgradeContext ruc) {
                     upgrade = true;
                 }
 
+                String newPort = newPluginConfig.getSimpleValue(JMX_PORT_PROPERTY);
+                String oldPort = oldPluginConfig.getSimpleValue(JMX_PORT_PROPERTY);
+                if (null != newPort && !newPort.equals(oldPort)) {
+                    oldPluginConfig.put(new PropertySimple(JMX_PORT_PROPERTY, newPort));
+                    upgrade = true;
+                }
+
+                String newJmxUrl = newPluginConfig
+                    .getSimpleValue(JMXDiscoveryComponent.CONNECTOR_ADDRESS_CONFIG_PROPERTY);
+                String oldJmxurl = oldPluginConfig
+                    .getSimpleValue(JMXDiscoveryComponent.CONNECTOR_ADDRESS_CONFIG_PROPERTY);
+                if (null != newJmxUrl && !newJmxUrl.equals(oldJmxurl)) {
+                    oldPluginConfig.put(new PropertySimple(JMXDiscoveryComponent.CONNECTOR_ADDRESS_CONFIG_PROPERTY,
+                        newJmxUrl));
+                    upgrade = true;
+                }
+
                 if (upgrade) {
                     result = new ResourceUpgradeReport();
                     result.setNewPluginConfiguration(oldPluginConfig);