modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java
| 11 ++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit f12571b2e6e4d5d17e8fb12a08f2cb781570a271
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Mar 28 11:36:50 2012 -0400
Add some more protection against a null AvailabilityType getting included
in an AvailabilityReport.
diff --git
a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java
b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java
index 037fed6..24fdcf5 100644
---
a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java
+++
b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java
@@ -151,7 +151,7 @@ public class AvailabilityExecutor implements Runnable,
Callable<AvailabilityRepo
if (Thread.interrupted()) {
if (log.isDebugEnabled()) {
log.debug("Exception occurred during availability check, but
this thread has been interrupted, "
- + "so most likely the plugin container is shutting
down: " + e);
+ + "so most likely the plugin container is shutting down:
" + e);
}
return availabilityReport;
}
@@ -308,15 +308,18 @@ public class AvailabilityExecutor implements Runnable,
Callable<AvailabilityRepo
}
}
}
- if (current == null) {
- current = AvailabilityType.DOWN;
+ }
+ if (null == current) {
+ if (log.isDebugEnabled()) {
+ log.debug("Protecting against null getAvailability(). Setting
DOWN to " + resource);
}
+ current = AvailabilityType.DOWN;
}
}
// Add the availability to the report if it changed from its previous state or if
this is a full report.
// Update the resource container only if the avail has changed.
- boolean availChanged = (previous == null) || (previous.getAvailabilityType() !=
current);
+ boolean availChanged = (null != current && (null == previous) || (current
!= previous.getAvailabilityType()));
if (availChanged || scan.isFull) {
Availability availability;
Show replies by date