From e6dc0a1615f25b2a0ad5eb068061ff157b439a0d Mon Sep 17 00:00:00 2001
From: Ron Anderson <ron.anderson@raytheon.com>
Date: Wed, 3 Oct 2012 14:43:19 -0500
Subject: [PATCH] Issue #1183 Fixed GFE retrieval of D2D wind grids

Change-Id: I28890a090c47ac46785dbe5c3e34c29f234d5661

Former-commit-id: 673adf3a8c116f7c8988c880ad88a0a59b113480 [formerly 898cbc342d97cf6d6a68b1fb767264a192d467b6] [formerly 8988ac120a6faa833c931993b0cf3601612d6c89] [formerly 407a393f2beec239c0c480aec0ba048b20c3ae7c [formerly 8988ac120a6faa833c931993b0cf3601612d6c89 [formerly 1ed6dc27041ebb5898c53f7983d40021bec4de79]]]
Former-commit-id: 407a393f2beec239c0c480aec0ba048b20c3ae7c
Former-commit-id: bda2e4afe5a4b9412d34891b0bd62643a8cb4fc7 [formerly 34644df28991977e3480ab6d50934d64de09f8dc]
Former-commit-id: 6e2b1520d9aca54633208ec08b573da74ea20fc8
---
 .../edex/plugin/gfe/db/dao/GFEDao.java        | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
index a1cdba2702..eeefc4fc38 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
@@ -811,14 +811,13 @@ public class GFEDao extends DefaultPluginDao {
                         3600 * 1000));
             }
 
-            if ((!uTimeList.isEmpty()) && (!vTimeList.isEmpty())
-                    & (uTimeList.size() == vTimeList.size())) {
-                for (TimeRange tr : uTimeList) {
-                    if (vTimeList.contains(tr)) {
-                        timeList.add(new TimeRange(tr.getStart(), tr.getStart()));
-                    }
+            for (TimeRange tr : uTimeList) {
+                if (vTimeList.contains(tr)) {
+                    timeList.add(new TimeRange(tr.getStart(), tr.getStart()));
                 }
+            }
 
+            if (!timeList.isEmpty()) {
                 return timeList;
             }
 
@@ -838,22 +837,21 @@ public class GFEDao extends DefaultPluginDao {
                         3600 * 1000));
             }
 
-            if ((!sTimeList.isEmpty()) && (!dTimeList.isEmpty())
-                    & (sTimeList.size() == dTimeList.size())) {
-                for (TimeRange tr : sTimeList) {
-                    if (dTimeList.contains(tr)) {
-                        timeList.add(new TimeRange(tr.getStart(), tr.getStart()));
-                    }
+            for (TimeRange tr : sTimeList) {
+                if (dTimeList.contains(tr)) {
+                    timeList.add(new TimeRange(tr.getStart(), tr.getStart()));
                 }
 
-                return timeList;
+                if (!timeList.isEmpty()) {
+                    return timeList;
+                }
             }
         } else {
             List<DataTime> results = executeD2DParmQuery(id);
             for (DataTime o : results) {
                 if (isMos(id)) {
-                    timeList.add(new TimeRange(o.getValidPeriod().getEnd(),
-                            o.getValidPeriod().getDuration()));
+                    timeList.add(new TimeRange(o.getValidPeriod().getEnd(), o
+                            .getValidPeriod().getDuration()));
                 } else {
                     timeList.add(o.getValidPeriod());
                 }