modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java
| 4 +++-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
| 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit cd00e463ea77f2f36c34f7fe6c389eb1478a1623
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Dec 20 17:28:21 2011 -0500
[BZ 766574] for some reason, the remote interface was removed from the discovery SLSB.
put it back.
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 fcb2f9e..2ea6234 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
@@ -99,7 +99,7 @@ import org.rhq.enterprise.server.util.LookupUtil;
* @author Greg Hinkle
*/
@Stateless
-public class DiscoveryBossBean implements DiscoveryBossLocal {
+public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemote {
private final Log log = LogFactory.getLog(DiscoveryBossBean.class.getName());
commit f5dbeaf1230cbc49efbc30c51367323aec1a6a43
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Dec 20 14:40:53 2011 -0500
[BZ 766574] fix NPE if there is no availability yet
diff --git
a/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java
b/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java
index 382ce8c..1623039 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java
@@ -44,6 +44,7 @@ import org.rhq.core.domain.configuration.Property;
import org.rhq.core.domain.configuration.PropertyList;
import org.rhq.core.domain.configuration.PropertyMap;
import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.measurement.ResourceAvailability;
import org.rhq.core.domain.resource.ResourceType;
@@ -671,7 +672,8 @@ public class TabularWriter {
} else if (object instanceof ResourceType) {
return ((ResourceType) object).getName();
} else if (object instanceof ResourceAvailability) {
- return ((ResourceAvailability) object).getAvailabilityType().getName();
+ AvailabilityType availType = ((ResourceAvailability)
object).getAvailabilityType();
+ return (availType == null) ? "?" : availType.getName();
} else if (object != null && object.getClass().isArray()) {
return Arrays.toString((Object[]) object);
} else {
Show replies by date