1 files changed, 8 insertions, 14 deletions

diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/Monitor.java b/pki/base/common/src/com/netscape/cms/servlet/cert/Monitor.java
index f32d6c18..649d7016 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/Monitor.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/Monitor.java
@@ -19,7 +19,6 @@ package com.netscape.cms.servlet.cert;
 
 
 import java.io.IOException;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.Locale;
@@ -348,9 +347,8 @@ public class Monitor extends CMSServlet {
                 int hour = Integer.parseInt(z.substring(8, 10));
                 int minute = Integer.parseInt(z.substring(10, 12));
                 int second = Integer.parseInt(z.substring(12, 14));
-                Calendar calendar= Calendar.getInstance();
-                calendar.set(year, month, date, hour, minute, second);
-                d = calendar.getTime();
+
+                d = new Date(year, month, date, hour, minute, second);
             } catch (NumberFormatException nfe) {
             }
         } else if (z != null && z.length() > 1 && z.charAt(0) == '-') {  // -5
@@ -367,25 +365,21 @@ public class Monitor extends CMSServlet {
     }
 
     String DateToZString(Date d) {
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(d);
-        
-        
-        String time = "" + (calendar.get(Calendar.YEAR));
-        int i = calendar.get(Calendar.MONTH) + 1;
+        String time = "" + (d.getYear() + 1900);
+        int i = d.getMonth() + 1;
 
         if (i < 10) time += "0";
         time += i;
-        i =  calendar.get(Calendar.DAY_OF_MONTH);
+        i = d.getDate();
         if (i < 10) time += "0";
         time += i;
-        i = calendar.get(Calendar.HOUR_OF_DAY);
+        i = d.getHours();
         if (i < 10) time += "0";
         time += i;
-        i = calendar.get(Calendar.MINUTE);
+        i = d.getMinutes();
         if (i < 10) time += "0";
         time += i;
-        i = calendar.get(Calendar.SECOND);
+        i = d.getSeconds();
         if (i < 10) time += "0";
         time += i + "Z";
         return time;