1 files changed, 7 insertions, 3 deletions
diff --git a/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java b/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java
index c492feac..dc240dac 100644
--- a/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java
+++ b/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java
@@ -27,6 +27,7 @@ import java.security.PublicKey;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateParsingException;
+import java.util.Calendar;
 import java.util.Date;
 
 import netscape.security.util.DerInputStream;
@@ -142,10 +143,13 @@ public abstract class CertificateInfo {
             int afterSec =
                 Integer.parseInt(mProperties.getAfterSec());
 
-            notBeforeDate = new Date(beginYear, beginMonth, beginDate,
+            Calendar calendar = Calendar.getInstance();
+            calendar.set(beginYear, beginMonth, beginDate,
                         beginHour, beginMin, beginSec);
-            notAfterDate = new Date(afterYear, afterMonth, afterDate,
-                        afterHour, afterMin, afterSec);
+            notBeforeDate = calendar.getTime();
+            calendar.set(afterYear, afterMonth, afterDate,
+                    afterHour, afterMin, afterSec);
+            notAfterDate = calendar.getTime();
         }
         return new CertificateValidity(notBeforeDate, notAfterDate);
     }