Re: [Hyperic-hq-discuss] hq r11894 - branches/HQ_4_0/src/org/hyperic/hq/measurement/server/session

[Scott F. <sco...@hy...>]

charles reviewed this.

On Nov 25, 2008, at 1:22 PM, sc...@hy... wrote:

> Author: scottmf
> Date: 2008-11-25 13:22:53 -0800 (Tue, 25 Nov 2008)
> New Revision: 11894
> URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=11894
>
> Modified:
>   branches/HQ_4_0/src/org/hyperic/hq/measurement/server/session/ 
> AvailabilityManagerEJBImpl.java
> Log:
> [HHQ-2586] clearing availability helper objects after they are used
>
> Modified: branches/HQ_4_0/src/org/hyperic/hq/measurement/server/ 
> session/AvailabilityManagerEJBImpl.java
> ===================================================================
> --- branches/HQ_4_0/src/org/hyperic/hq/measurement/server/session/ 
> AvailabilityManagerEJBImpl.java	2008-11-25 20:45:01 UTC (rev 11893)
> +++ branches/HQ_4_0/src/org/hyperic/hq/measurement/server/session/ 
> AvailabilityManagerEJBImpl.java	2008-11-25 21:22:53 UTC (rev 11894)
> @@ -28,7 +28,6 @@
> import java.util.ArrayList;
> import java.util.Arrays;
> import java.util.Collection;
> -import java.util.Comparator;
> import java.util.HashMap;
> import java.util.HashSet;
> import java.util.Iterator;
> @@ -103,8 +102,8 @@
>     private final AvailabilityDataDAO _dao = getAvailabilityDataDAO();
>     private final Map _createMap = new HashMap();
>     private final Map _removeMap = new HashMap();
> -
>     private Map _currAvails = null;
> +
>     private static final long MAX_DATA_BACKLOG_TIME =
>         7 * MeasurementConstants.DAY;
>
> @@ -586,6 +585,10 @@
>                 _log.error(e.getMessage(), e);
>                 cache.rollbackTran();
>                 throw new SystemException(e);
> +            } finally {
> +                _createMap.clear();
> +                _removeMap.clear();
> +                _currAvails.clear();
>             }
>         }
>         sendDataToEventHandlers(availPoints);
>