Bugzilla Bug #496334 - Renewal: Missing information in the first 6 requests in the CA request queue.

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@420 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

1 files changed, 21 insertions, 7 deletions

diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java
index fd12de3b1..08f0686c3 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java
@@ -204,8 +204,11 @@ public class CertUtil {
         req.setExtData("requestor_name", "");
         req.setExtData("requestor_email", "");
         req.setExtData("requestor_phone", "");
+        req.setExtData("profileRemoteHost", "");
+        req.setExtData("profileRemoteAddr", "");
         req.setExtData("requestnotes","");
         req.setExtData("isencryptioncert", "false");
+        req.setExtData("profileapprovedby", "system");
 
         // mark request as complete
         CMS.debug("certUtil: calling setRequestStatus");
@@ -264,6 +267,8 @@ public class CertUtil {
         ICertificateRepository cr = null;
         RequestId reqId = null;
         String profileId = null;
+        IRequestQueue queue = null; 
+        IRequest req = null;
 
         try {
             String dn = config.getString(prefix + certTag + ".dn");
@@ -296,9 +301,8 @@ public class CertUtil {
                     instanceRoot + "/conf/" + profile);
 
             // cfu - create request to enable renewal
-            IRequest req = null;
             try {
-                IRequestQueue queue = ca.getRequestQueue();
+                queue = ca.getRequestQueue();
                 if (queue != null) {
                     req = createLocalRequest(queue, serialNo.toString(), info);
                     CMS.debug("CertUtil profile name= "+profile);
@@ -321,11 +325,6 @@ public class CertUtil {
 
                     reqId = req.getRequestId();
                     config.putString("preop.cert." + certTag + ".reqId", reqId.toString());
-
-                    CMS.debug("certUtil: before updateRequest");
-
-                    // store request record in db
-                    queue.updateRequest(req);
                 } else {
                     CMS.debug("certUtil: requestQueue null");
                 }
@@ -407,6 +406,21 @@ public class CertUtil {
             }
         }
 
+        if (req != null) {
+            // update request with cert 
+            req.setExtData(IEnrollProfile.REQUEST_ISSUED_CERT, cert);
+
+            // store request in db 
+            try {
+                CMS.debug("certUtil: before updateRequest");
+                if (queue != null) {
+                    queue.updateRequest(req);
+                }
+            } catch (Exception e) {
+                CMS.debug("Exception in updateRequest" + e);
+            }
+        }
+
         return cert;
     }