From d74013151988bb8e64280b7a0bc360daeb4083c9 Mon Sep 17 00:00:00 2001
From: Dave Hladky <david_j_hladky@raytheon.com>
Date: Wed, 7 May 2014 14:51:38 -0500
Subject: [PATCH] Issue #2940 More filenames printed, null from bad rec.

Former-commit-id: e40c9a7be84f49b51dabdddd9a9ef285a8756688 [formerly cd4921b35fb0fc5984367b1fa0fbaeb127e9fb32] [formerly a2ef100bfc1b74082ab0fb70f7cce5bc599318e0] [formerly e40c9a7be84f49b51dabdddd9a9ef285a8756688 [formerly cd4921b35fb0fc5984367b1fa0fbaeb127e9fb32] [formerly a2ef100bfc1b74082ab0fb70f7cce5bc599318e0] [formerly dadc604ab30cf26f9ec6b35893a812d4190ba01c [formerly a2ef100bfc1b74082ab0fb70f7cce5bc599318e0 [formerly 26bfd426965d208f92bcb1fcd650b5f2299724a4]]]]
Former-commit-id: dadc604ab30cf26f9ec6b35893a812d4190ba01c
Former-commit-id: af478efa5d2f2b6b764248f09da0525d8feb5ec7 [formerly e58fa39adca13f0156377dfbdc63fe4d59caed33] [formerly 30f08e0872c7bff47d05e441f1dd1375d4fa9d03 [formerly f54cbb83a1a616ca543ea1eb1ca6d6d636563f9e]]
Former-commit-id: 703f3933ff157bb876bac2fb5586159e18bb37bb [formerly 07c49a82b519940b4e23d11323f8bcb1b08c03ff]
Former-commit-id: 24a1a5a0c68df5893bdadedf367820a4f432530c
---
 .../plugin/ffmp/common/FFMPProcessor.java     | 55 +++++++++++--------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFMPProcessor.java b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFMPProcessor.java
index be1166159b..a841b1d811 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFMPProcessor.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFMPProcessor.java
@@ -95,12 +95,12 @@ import com.vividsolutions.jts.geom.Polygon;
  * ------------ ----------  ----------- --------------------------
  * 
  * 07/14/09      2152       D. Hladky   Initial release
- * 10/25/12		DR 15514    G. Zhang	Fix ConcurrentModificationException
+ * 10/25/12     DR 15514    G. Zhang    Fix ConcurrentModificationException
  * 02/01/13     1569        D. Hladky   Added constants
  * 02/25/13     1660        D. Hladky   FFTI design change to help mosaic processing.
  * 05/01/2013   15684       zhao        Unlock when Exception caught
  * Jul 15, 2013 2184        dhladky     Remove all HUC's for storage except ALL
- * 09/03/2013   DR 13083    G. Zhang	Added a fix in processRADAR(ArrayList<SourceBinEntry>).
+ * 09/03/2013   DR 13083    G. Zhang    Added a fix in processRADAR(ArrayList<SourceBinEntry>).
  * 03 April 2014 2940       dhladky     Better error message for bad configurations.
  * </pre>
  * @author dhladky
@@ -218,7 +218,7 @@ public class FFMPProcessor {
         }
 
         statusHandler.handle(Priority.INFO,
-                "Processed Source: " + ffmpRec.getSourceName() + " sitekey: "
+                "Processed Source: " + source.getSourceName() + " sitekey: "
                         + siteKey + " dataKey: " + dataKey + " time: "
                         + (System.currentTimeMillis() - time));
 
@@ -637,12 +637,12 @@ public class FFMPProcessor {
                                 + source.getDisplayName();
                     }
 
-					Date backDate = new Date(ffmpRec.getDataTime().getRefTime()
-							.getTime()-(FFMPGenerator.SOURCE_CACHE_TIME * TimeUtil.MILLIS_PER_HOUR));
-	
-					FFMPDataContainer ffgContainer = generator
-							.getFFMPDataContainer(sourceNameString, 
-									backDate);
+                    Date backDate = new Date(ffmpRec.getDataTime().getRefTime()
+                            .getTime()-(FFMPGenerator.SOURCE_CACHE_TIME * TimeUtil.MILLIS_PER_HOUR));
+    
+                    FFMPDataContainer ffgContainer = generator
+                            .getFFMPDataContainer(sourceNameString, 
+                                    backDate);
 
                     if (ffgContainer != null
                             && ffgContainer.containsKey(source.getSourceName())) {
@@ -1139,19 +1139,19 @@ public class FFMPProcessor {
         if (radarRec.getMnemonic().equals("DHR")) {
 
             for (int j = 0; j < dataVals.length; j++) {
-				try {
-					val += ScanUtils.getZRvalue2(dataVals[j],//fval,// DR 13083
-							dhrMap.get(DHRValues.ZRMULTCOEFF),
-							dhrMap.get(DHRValues.MAXPRECIPRATEALLOW),
-							dhrMap.get(DHRValues.ZRPOWERCOEFF),
-							dhrMap.get(DHRValues.BIAS_TO_USE))
-							* areas[j];
-					area += areas[j];
-				} catch (Exception e) {
-					statusHandler
-							.error("DHR parameters are NULL, can't process!"
-									+ e.getMessage());
-				}
+                try {
+                    val += ScanUtils.getZRvalue2(dataVals[j],//fval,// DR 13083
+                            dhrMap.get(DHRValues.ZRMULTCOEFF),
+                            dhrMap.get(DHRValues.MAXPRECIPRATEALLOW),
+                            dhrMap.get(DHRValues.ZRPOWERCOEFF),
+                            dhrMap.get(DHRValues.BIAS_TO_USE))
+                            * areas[j];
+                    area += areas[j];
+                } catch (Exception e) {
+                    statusHandler
+                            .error("DHR parameters are NULL, can't process!"
+                                    + e.getMessage());
+                }
             }
 
         } else if (radarRec.getMnemonic().equals("DPR")) {
@@ -1826,18 +1826,25 @@ public class FFMPProcessor {
     }
 
     /**
-     * Gets the XMRG data array
+     * Gets the XMRG data array, checks HRAP/XMRG config for sanity.
      * 
      * @return
      */
     private short[][] getXMRGData() throws Exception {
 
+        String fileName = "MISSING";
+        
+        if (xmrg.getFile() != null) {
+            fileName = xmrg.getFile().getAbsolutePath();
+        }
+        
         this.extent = getExtents(source.getHrapGridFactor());
         setHRAPSubGrid(extent, source.getHrapGridFactor());
+       
         if (xmrg.getHrapExtent() != null) {
             xmrgData = xmrg.getData(extent);
         } else {
-            throw new MalformedDataException("The XMRG data is malformed or the file is non-readable.");
+            throw new MalformedDataException("The XMRG data is malformed or the file is non-readable. "+fileName);
         }
 
         return xmrgData;