From ff34546eb183e5e7ce1cda238ceff08c38fb2404 Mon Sep 17 00:00:00 2001
From: Brad Gonzales <bradley_l_gonzales@raytheon.com>
Date: Fri, 24 Jan 2014 08:38:22 -0600
Subject: [PATCH] Issue #2709 Fix for recurring subscription active period end.

Change-Id: I05778e95fe703c7301205ad14909c843d720fd2e

Former-commit-id: fa10363d40a14369bad2e91533907a99c681842b [formerly e1e7f1c2500a2ef82ad7baddf9a5242f4b343261 [formerly ddfc4d07aa4591f39ee5590de2d1bb67837e6229]]
Former-commit-id: e1e7f1c2500a2ef82ad7baddf9a5242f4b343261
Former-commit-id: 2fb15c41baf249e9d2988ad8eb4650bc9b803fe3
---
 .../common/datadelivery/registry/RecurringSubscription.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/RecurringSubscription.java b/edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/RecurringSubscription.java
index 5283c360fd..c37a7a8e02 100644
--- a/edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/RecurringSubscription.java
+++ b/edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/RecurringSubscription.java
@@ -66,6 +66,7 @@ import com.raytheon.uf.common.time.util.TimeUtil;
  * Jan 08, 2014 2615       bgonzale     Implement calculate start and calculate end methods.
  * Jan 14, 2014 2459       mpduff       Add subscription state.
  * Jan 20, 2013 2398       dhladky      Fixed rescheduling beyond active period/expired window.                                 
+ * Jan 24, 2013 2709       bgonzale     Fix setting of active period end.
  * 
  * </pre>
  * 
@@ -469,7 +470,7 @@ public abstract class RecurringSubscription<T extends Time, C extends Coverage>
         // active period values are month and day of month only, use base
         // Calendar for active period year
         Calendar activePeriodEndCal = TimeUtil.newCalendar(activePeriodEnd);
-        TimeUtil.maxCalendarFields(activePeriodEndCal, Calendar.MILLISECOND,
+        TimeUtil.minCalendarFields(activePeriodEndCal, Calendar.MILLISECOND,
                 Calendar.SECOND, Calendar.MINUTE, Calendar.HOUR_OF_DAY);
         activePeriodEndCal.set(Calendar.YEAR, base.get(Calendar.YEAR));
         return activePeriodEndCal;
@@ -496,7 +497,7 @@ public abstract class RecurringSubscription<T extends Time, C extends Coverage>
         boolean hasActivePeriodEnd = activePeriodEnd != null;
         if (hasActivePeriodEnd) {
             realEnd = getActivePeriodEnd(endConstraint);
-            if (realEnd.before(endConstraint)) {
+            if (realEnd.after(endConstraint)) {
                 realEnd = endConstraint;
             }
         } else {