modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java | 8 ++++---- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-)
New commits: commit a654a7ca2299266554b0ab884f9faa78fcd13be5 Author: John Sanda jsanda@redhat.com Date: Mon Apr 29 17:52:06 2013 -0400
guard against NPE
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java index 7535875..200e5f7 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java @@ -70,6 +70,9 @@ public class MetricsManagerBean implements MetricsManagerLocal { MetricsServer metricsServer = getMetricsServer(); RawNumericMetric metric = metricsServer.findLatestValueForResource(scheduleId);
+ if (metric == null) { + return null; + } return new MeasurementDataNumeric(metric.getTimestamp(), scheduleId, metric.getValue()); }
commit 1d159b1c22037b5aa1cfc6d92d33a492837c7461 Author: John Sanda jsanda@redhat.com Date: Mon Apr 29 17:38:37 2013 -0400
minor change for command line path resolution
diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java index ce63dff..39a4a64 100644 --- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java +++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java @@ -100,7 +100,7 @@ public class StorageInstaller {
private File logDir;
- private String dirPrefix = (isWindows()) ? "" : "var/lib"; + private String dirPrefix = (isWindows()) ? "" : "/var/lib";
private String commitLogDir = dirPrefix + "/rhq/storage/commitlog";
@@ -410,9 +410,9 @@ public class StorageInstaller { File basedir = new File(deploymentOptions.getBasedir()); File binDir = new File(basedir, "bin");
- cmdLine = new org.apache.commons.exec.CommandLine("cassandra"); - cmdLine.addArgument("--PidFile"); - cmdLine.addArgument("cassandra.pid"); + cmdLine = new org.apache.commons.exec.CommandLine(new File(binDir, "cassandra")); + cmdLine.addArgument("-p"); + cmdLine.addArgument(new File(binDir, "cassandra.pid").getAbsolutePath()); errOutput = exec(binDir, cmdLine);
if (!errOutput.isEmpty()) {
rhq-commits@lists.fedorahosted.org