modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/InstallerGWTServiceImpl.java
| 3 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerBean.java
| 23 ++++++----
2 files changed, 18 insertions(+), 8 deletions(-)
New commits:
commit a30989655f099e397c5db23cd61194ffd09a429f
Author: Jay Shaughnessy <jshaughn(a)jshaughn.csb>
Date: Tue Sep 25 16:17:08 2012 -0400
Make sure the installer, startupBean and serverManager.getidentity() are
all using the same approach for determining the default server name, otherwise
duplicate entries end up in the rhq_server table, which can cause problems.
diff --git
a/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/InstallerGWTServiceImpl.java
b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/InstallerGWTServiceImpl.java
index 9c0f871..5c73766 100644
---
a/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/InstallerGWTServiceImpl.java
+++
b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/InstallerGWTServiceImpl.java
@@ -560,14 +560,17 @@ public class InstallerGWTServiceImpl extends RemoteServiceServlet
implements Ins
// if nothing was specified, we'll default to the canonical host name.
if (ServerInstallUtil.isEmpty(publicEndpoint)) {
String connBindAddress =
serverProperties.get(ServerProperties.PROP_CONNECTOR_BIND_ADDRESS);
+
if ((!ServerInstallUtil.isEmpty(connBindAddress)) &&
(!"0.0.0.0".equals(connBindAddress.trim()))) {
// the server-side connector bind address is explicitly set, use that
publicEndpoint = connBindAddress.trim();
+
} else {
String serverBindAddress =
serverProperties.get(ServerProperties.PROP_JBOSS_BIND_ADDRESS);
if ((!ServerInstallUtil.isEmpty(serverBindAddress)) &&
(!"0.0.0.0".equals(serverBindAddress.trim()))) {
// the main JBossAS server bind address is set and it isn't
0.0.0.0, use that
publicEndpoint = serverBindAddress.trim();
+
} else {
try {
publicEndpoint =
InetAddress.getLocalHost().getCanonicalHostName();
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerBean.java
index 9549b6c..b74df73 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerBean.java
@@ -125,11 +125,18 @@ public class ServerManagerBean implements ServerManagerLocal {
}
public String getIdentity() {
- String identity = System.getProperty(RHQ_SERVER_NAME_PROPERTY, "");
- if (identity.equals("")) {
- return "localhost";
+
+ // The property may return "" so also use "" as the default
to ensure we set it to something useful
+ String result = System.getProperty(RHQ_SERVER_NAME_PROPERTY, "");
+
+ if ("".equals(result)) {
+ try {
+ result = InetAddress.getLocalHost().getCanonicalHostName();
+ } catch (UnknownHostException e) {
+ result = "localhost";
+ }
}
- return identity;
+ return result;
}
public List<Agent> getAgents() {
@@ -201,16 +208,16 @@ public class ServerManagerBean implements ServerManagerLocal {
printWithTrace("establishCurrentServerMode:
MAINTENANCE->NORMAL, clearing agent references");
clearAgentReferences(server);
-
ServerCommunicationsServiceUtil.getService().safeGetServiceContainer().removeCommandListener(
- getMaintenanceModeListener());
+
ServerCommunicationsServiceUtil.getService().safeGetServiceContainer()
+ .removeCommandListener(getMaintenanceModeListener());
log.info("Notified communication layer of server operation mode
" + serverMode);
}
} else if (Server.OperationMode.MAINTENANCE == serverMode) {
// If moving into Maintenance Mode from any other mode then stop
processing agent commands
-
ServerCommunicationsServiceUtil.getService().safeGetServiceContainer().addCommandListener(
- getMaintenanceModeListener());
+ ServerCommunicationsServiceUtil.getService().safeGetServiceContainer()
+ .addCommandListener(getMaintenanceModeListener());
log.info("Notified communication layer of server operation mode
" + serverMode);
Show replies by date