modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java
| 12 +++++-----
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
| 5 +++-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java
| 7 ++++-
3 files changed, 16 insertions(+), 8 deletions(-)
New commits:
commit a6d145b4c1f2f200a9bbcfc13933a01e9815f01b
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Nov 29 18:35:13 2010 +0100
BZ 657232
* Don't throw NPE while destroying an agent on the server-side
if there is no command spool file name defined.
* Improve the error messages during intermittent confusion of the server
and agent after platform removal.
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java
index a299dfc..29116d8 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java
@@ -438,11 +438,13 @@ public class ServerCommunicationsService implements
ServerCommunicationsServiceM
try {
ClientCommandSenderConfiguration sender_config =
getSenderConfiguration(agent);
- spool_file = new File(sender_config.dataDirectory,
sender_config.commandSpoolFileName);
- if (spool_file.exists()) {
- // first truncate it, in case Windows is locking it; then try to
delete
- new FileOutputStream(spool_file, false).close();
- spool_file.delete();
+ if (sender_config.commandSpoolFileName != null) {
+ spool_file = new File(sender_config.dataDirectory,
sender_config.commandSpoolFileName);
+ if (spool_file.exists()) {
+ // first truncate it, in case Windows is locking it; then try to
delete
+ new FileOutputStream(spool_file, false).close();
+ spool_file.delete();
+ }
}
} catch (Exception e) {
LOG.warn("Failed to truncate/delete spool for deleted agent ["
+ agent + "]"
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
index 2773b4c..c96c6f5 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
@@ -115,7 +115,10 @@ public class DiscoveryBossBean implements DiscoveryBossLocal,
DiscoveryBossRemot
Agent knownAgent = agentManager.getAgentByName(agent.getName());
if (knownAgent == null) {
throw new InvalidInventoryReportException("Unknown Agent named [" +
agent.getName()
- + "] sent an inventory report - that report will be ignored");
+ + "] sent an inventory report - that report will be ignored. "
+ + "This error is harmless and should stop appearing after a short
while if the platform of the agent ["
+ + agent.getName()
+ + "] was recently removed from the inventory. In any other case this
is a bug.");
}
if (log.isDebugEnabled()) {
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java
index 0a4c3ec..cd950e6 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java
@@ -506,9 +506,12 @@ public class AvailabilityManagerBean implements
AvailabilityManagerLocal, Availa
return false;
}
} else {
- log.error("Could not figure out which agent sent availability report.
This is a bug, please report it. "
+ log.error("Could not figure out which agent sent availability report.
"
+ + "This error is harmless and should stop appearing after a short
while if the platform of the agent ["
+ + agentName
+ + "] was recently removed. In any other case this is a bug."
+ report);
- }
+ }
return true; // everything is OK and things look to be in sync
}
Show replies by date