From 3c3ca54bfde39ba7df13bd7409b47580cfa0bd39 Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Tue, 07 Aug 2012 15:09:24 +0000
Subject: [PATCH] Fix OPENDJ-559 UTCTimeSyntax parses 32... as 1932
---
opends/src/server/org/opends/server/schema/UTCTimeSyntax.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/opends/src/server/org/opends/server/schema/UTCTimeSyntax.java b/opends/src/server/org/opends/server/schema/UTCTimeSyntax.java
index 1599e17..78bb6b3 100644
--- a/opends/src/server/org/opends/server/schema/UTCTimeSyntax.java
+++ b/opends/src/server/org/opends/server/schema/UTCTimeSyntax.java
@@ -30,6 +30,7 @@
import java.text.SimpleDateFormat;
+import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
@@ -86,6 +87,11 @@
*/
private static SimpleDateFormat dateFormat;
+ /**
+ * The date formatter needs help converting 2-digit years.
+ */
+ private static Date datum1900;
+ private static Date datum2000;
// The default equality matching rule for this syntax.
@@ -109,6 +115,15 @@
dateFormat.setLenient(false);
dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+ Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+ cal.clear();
+ cal.set(1900, 0, 1);
+ datum1900 = cal.getTime();
+
+ cal.clear();
+ cal.set(2000, 0, 1);
+ datum2000 = cal.getTime();
+
dateFormatLock = new Object();
}
@@ -865,10 +880,33 @@
throws DirectoryException
{
String valueString = normalizedValue.toString();
+
try
{
synchronized (dateFormatLock)
{
+ // RFC 3280 4.1.2.5.1. defines the datum we need to
+ // set for the parser.
+ switch (valueString.charAt(0))
+ {
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ // 00-49
+ dateFormat.set2DigitYearStart(datum2000);
+ break;
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ default:
+ // 50-99
+ dateFormat.set2DigitYearStart(datum1900);
+ break;
+ }
return dateFormat.parse(valueString);
}
}
--
Gitblit v1.10.0