[Hyperic-hq-discuss] hq r14174 - branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/bizapp/server/session

[<sc...@hy...>]

Author: scottmf
Date: 2010-01-13 11:27:24 -0800 (Wed, 13 Jan 2010)
New Revision: 14174
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14174

Modified:
   branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/bizapp/server/session/MetricSessionEJB.java
Log:
[HHQ-3667] removed a couple NPE potentials

Modified: branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/bizapp/server/session/MetricSessionEJB.java
===================================================================
--- branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/bizapp/server/session/MetricSessionEJB.java	2010-01-13 19:25:26 UTC (rev 14173)
+++ branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/bizapp/server/session/MetricSessionEJB.java	2010-01-13 19:27:24 UTC (rev 14174)
@@ -426,8 +426,9 @@
                 if (r == null || r.isInAsyncDeleteState()) {
                     continue;
                 }
-                Measurement meas = (Measurement)midMap.get(r.getId());
-                if (null == midMap || null == meas) {
+                Measurement meas;
+                if (null == midMap
+                        || null == (meas = (Measurement)midMap.get(r.getId()))) {
                     if (debug) watch.markTimeBegin("getAvailabilityMeasurement");
                     meas = mMan.getAvailabilityMeasurement(r);
                     if (debug) watch.markTimeEnd("getAvailabilityMeasurement");
@@ -615,8 +616,9 @@
             if (debug) watch.markTimeBegin("findResource size=" + size);
             final Resource res = rMan.findResource(id);
             if (debug) watch.markTimeEnd("findResource size=" + size);
-            List list = (List) measCache.get(res.getId());
-            if (null != measCache && null != list) {
+            List list;
+            if (null != measCache
+                   && null != (list = (List)measCache.get(res.getId()))) {
                 if (list.size() > 1) {
                     log.warn("resourceId " + res.getId() +
                              " has more than one availability measurement " +