diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthGraphDataAdapter.java b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthGraphDataAdapter.java index 17cdbe5fea..337f0ee69d 100644 --- a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthGraphDataAdapter.java +++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthGraphDataAdapter.java @@ -61,6 +61,7 @@ import com.raytheon.uf.edex.datadelivery.bandwidth.retrieval.RetrievalPlan; * Jul 11, 2013 2106 djohnson Use priority straight from the BandwidthSubscription. * Sep 20, 2013 2397 bgonzale Add Map of Bucket Descriptions to BandwidthGraphData. * Nov 27, 2013 2545 mpduff Get data by network + * Dec 11, 2013 2566 bgonzale handle case when there are no reservations. * * * @@ -130,12 +131,14 @@ class BandwidthGraphDataAdapter { final List bandwidthReservations = retrievalPlan .getBandwidthReservationsForBucket(bucket); - for (BandwidthReservation reservation : bandwidthReservations) { - if (!reservations.containsKey(reservation.getId())) { - reservations.put(reservation.getId(), - new ArrayList()); + if (bandwidthReservations != null) { + for (BandwidthReservation reservation : bandwidthReservations) { + if (!reservations.containsKey(reservation.getId())) { + reservations.put(reservation.getId(), + new ArrayList()); + } + reservations.get(reservation.getId()).add(reservation); } - reservations.get(reservation.getId()).add(reservation); } } } @@ -177,9 +180,13 @@ class BandwidthGraphDataAdapter { List binStartTimes = new ArrayList(); binStartTimes.add(retrieval.getStartTime().getTimeInMillis()); - for (BandwidthReservation reservation : reservations.get(retrieval - .getIdentifier())) { - binStartTimes.add(reservation.getBandwidthBucket()); + List retrievalReservations = reservations + .get(retrieval.getIdentifier()); + + if (retrievalReservations != null) { + for (BandwidthReservation reservation : retrievalReservations) { + binStartTimes.add(reservation.getBandwidthBucket()); + } } window.setBinStartTimes(binStartTimes); windowData.addTimeWindow(window);