From 2ba1652a6ce1a77eb0fcc86f678f4caab376720b Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 14 Oct 2011 12:27:25 +0000
Subject: [PATCH] OPENDJ-308: Implement access log filtering and configurable message format

---
 opends/src/server/org/opends/server/util/TimeThread.java |   15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/opends/src/server/org/opends/server/util/TimeThread.java b/opends/src/server/org/opends/server/util/TimeThread.java
index 27399b4..e63e211 100644
--- a/opends/src/server/org/opends/server/util/TimeThread.java
+++ b/opends/src/server/org/opends/server/util/TimeThread.java
@@ -23,6 +23,7 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
+ *      Portions copyright 2011 ForgeRock AS.
  */
 package org.opends.server.util;
 
@@ -34,7 +35,6 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
@@ -392,17 +392,8 @@
   {
     checkState();
 
-    Iterator<SimpleDateFormat> iterator =
-        INSTANCE.timeInfo.userDefinedFormatters.iterator();
-    while (iterator.hasNext())
-    {
-      SimpleDateFormat format = iterator.next();
-      if (format.toPattern().equals(formatString))
-      {
-        iterator.remove();
-      }
-    }
-
+    INSTANCE.timeInfo.userDefinedFormatters.remove(new SimpleDateFormat(
+        formatString));
     INSTANCE.timeInfo.userDefinedTimeStrings.remove(formatString);
   }
 

--
Gitblit v1.10.0