Merge branch 'main' into feature/ResEvap-document-updates

rma-kayla · Feb 4, 2025 · 6f60d83 · 6f60d83
2 parents 6ba56c3 + 4495dda
commit 6f60d83
Showing 1 changed file with 21 additions and 16 deletions.
diff --git a/java/opendcs/src/main/java/decodes/cwms/algo/ResEvapAlgo.java b/java/opendcs/src/main/java/decodes/cwms/algo/ResEvapAlgo.java
@@ -560,32 +560,37 @@ protected void doAWTimeSlice()
     protected void afterTimeSlices()
             throws DbCompException
     {
-        if (baseTimes.size() == 24 || (baseTimes.size() == 23 && isDayLightSavings))
+        try
         {
-            setOutput(dailyEvap, tally, _timeSliceBaseTime);
-            try
+            if (baseTimes.size() == 24 || (baseTimes.size() == 23 && isDayLightSavings))
             {
-                setAsFlow(tally, _timeSliceBaseTime);
+                setOutput(dailyEvap, tally, _timeSliceBaseTime);
+                try
+                {
+                    setAsFlow(tally, _timeSliceBaseTime);
+                }
+                catch (RatingException | NoConversionException | DecodesException ex)
+                {
+                    throw new DbCompException("Failed to compute flow values from evap rate", ex);
+                }
+                setDailyProfiles(_timeSliceBaseTime);
+
+                //TODO save HourlyWTP
+                //		hourlyWTP.SaveProfiles(timeSeriesDAO);
+                dailyWTP.SaveProfiles(timeSeriesDAO);
             }
-            catch (RatingException | NoConversionException | DecodesException ex)
+            else
             {
-                throw new DbCompException("Failed to compute flow values from evap rate", ex);
+                warning("There are less than 24 hourly samples, can not compute daily sums");
             }
-            setDailyProfiles(_timeSliceBaseTime);
-
-            //TODO save HourlyWTP
-            //		hourlyWTP.SaveProfiles(timeSeriesDAO);
-            dailyWTP.SaveProfiles(timeSeriesDAO);
-
+        }
+        finally
+        {
             tsdb.freeConnection(conn);
             crd.close();
             siteDAO.close();
             timeSeriesDAO.close();
         }
-        else
-        {
-            warning("There are less than 24 hourly samples, can not compute daily sums");
-        }
 //AW:AFTER_TIMESLICES
 //AW:AFTER_TIMESLICES_END
     }