Source:
<code>public TopologyInfo(EmbeddedCacheManager cacheManager, Config.Scope config, boolean embedded) { String siteName; String nodeName; boolean isGeneratedNodeName = false; if (!embedded) { Transport transport = cacheManager.getTransport(); if (transport != null) { <START> nodeName = cacheManager.getCacheManagerConfiguration().transport().nodeName(); <END> siteName = cacheManager.getCacheManagerConfiguration().transport().siteId(); if (siteName == null) { siteName = System.getProperty(InfinispanConnectionProvider.JBOSS_SITE_NAME); } } else { nodeName = System.getProperty(InfinispanConnectionProvider.JBOSS_NODE_NAME); siteName = System.getProperty(InfinispanConnectionProvider.JBOSS_SITE_NAME); } if (nodeName == null || nodeName.equals("localhost")) { isGeneratedNodeName = true; nodeName = generateNodeName(); } } else { boolean clustered = config.getBoolean("clustered", false); nodeName = config.get("nodeName", System.getProperty(InfinispanConnectionProvider.JBOSS_NODE_NAME)); if (nodeName != null && nodeName.isEmpty()) { nodeName = null; } siteName = config.get("siteName", System.getProperty(InfinispanConnectionProvider.JBOSS_SITE_NAME)); if (siteName != null && siteName.isEmpty()) { siteName = null; } if (nodeName == null) { if (!clustered) { isGeneratedNodeName = true; nodeName = generateNodeName(); } else { throw new IllegalStateException("You must set jboss.node.name if you use clustered mode for InfinispanConnectionProvider"); } } } this.myNodeName = nodeName; this.mySiteName = siteName; this.isGeneratedNodeName = isGeneratedNodeName; }</code><technical_language>I top of head. good try run server with/without property "-Djboss.node.name=mynode1" for cluster/non-cluster configuration check behaves expected. check cluster/cross-dc tests broken this change :)</technical_language>

Target:
public TopologyInfo(EmbeddedCacheManager cacheManager, Config.Scope config, boolean embedded) { String siteName; String nodeName; boolean isGeneratedNodeName = false; if (!embedded) { Transport transport = cacheManager.getTransport(); if (transport != null) { nodeName = transport.getAddress().toString(); siteName = cacheManager.getCacheManagerConfiguration().transport().siteId(); if (siteName == null) { siteName = System.getProperty(InfinispanConnectionProvider.JBOSS_SITE_NAME); } } else { nodeName = System.getProperty(InfinispanConnectionProvider.JBOSS_NODE_NAME); siteName = System.getProperty(InfinispanConnectionProvider.JBOSS_SITE_NAME); } if (nodeName == null || nodeName.equals("localhost")) { isGeneratedNodeName = true; nodeName = generateNodeName(); } } else { boolean clustered = config.getBoolean("clustered", false); nodeName = config.get("nodeName", System.getProperty(InfinispanConnectionProvider.JBOSS_NODE_NAME)); if (nodeName != null && nodeName.isEmpty()) { nodeName = null; } siteName = config.get("siteName", System.getProperty(InfinispanConnectionProvider.JBOSS_SITE_NAME)); if (siteName != null && siteName.isEmpty()) { siteName = null; } if (nodeName == null) { if (!clustered) { isGeneratedNodeName = true; nodeName = generateNodeName(); } else { throw new IllegalStateException("You must set jboss.node.name if you use clustered mode for InfinispanConnectionProvider"); } } } this.myNodeName = nodeName; this.mySiteName = siteName; this.isGeneratedNodeName = isGeneratedNodeName; }