Refactored RequestStatus.

The RequestStatus has been modified to use a map to convert string
into RequestStatus instance. The string constants in RequestStatus
are no longer needed because instances can be compared using
equal sign directly or equals().

Ticket #161

6 files changed, 84 insertions, 111 deletions

diff --git a/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java b/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
index b7120010a..b45f46d12 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
@@ -374,7 +374,7 @@ public class CMCRevReqServlet extends CMSServlet {
         String auditRequesterID = auditRequesterID(req);
         String auditSerialNumber = auditSerialNumber(eeSerialNumber);
         String auditRequestType = auditRequestType(reason);
-        String auditApprovalStatus = ILogger.SIGNED_AUDIT_EMPTY_VALUE;
+        RequestStatus auditApprovalStatus = null;
         String auditReasonNum = String.valueOf(reason);
 
         try {
@@ -576,7 +576,7 @@ public class CMCRevReqServlet extends CMSServlet {
             mQueue.processRequest(revReq);
 
             // retrieve the request status
-            auditApprovalStatus = revReq.getRequestStatus().toString();
+            auditApprovalStatus = revReq.getRequestStatus();
 
             RequestStatus stat = revReq.getRequestStatus();
 
@@ -810,9 +810,9 @@ public class CMCRevReqServlet extends CMSServlet {
             // store a message in the signed audit log file
             // if and only if "auditApprovalStatus" is
             // "complete", "revoked", or "canceled"
-            if ((auditApprovalStatus.equals(RequestStatus.COMPLETE_STRING))
-                    || (auditApprovalStatus.equals(RequestStatus.REJECTED_STRING))
-                    || (auditApprovalStatus.equals(RequestStatus.CANCELED_STRING))) {
+            if (auditApprovalStatus == RequestStatus.COMPLETE ||
+                    auditApprovalStatus == RequestStatus.REJECTED ||
+                    auditApprovalStatus == RequestStatus.CANCELED) {
                 auditMessage = CMS.getLogMessage(
                         LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED,
                         auditSubjectID,
@@ -821,7 +821,7 @@ public class CMCRevReqServlet extends CMSServlet {
                         auditSerialNumber,
                         auditRequestType,
                         auditReasonNum,
-                        auditApprovalStatus);
+                        auditApprovalStatus == null ? ILogger.SIGNED_AUDIT_EMPTY_VALUE : auditApprovalStatus.toString());
 
                 audit(auditMessage);
             }
@@ -844,9 +844,9 @@ public class CMCRevReqServlet extends CMSServlet {
                 // message in the signed audit log file
                 // if and only if "auditApprovalStatus" is
                 // "complete", "revoked", or "canceled"
-                if ((auditApprovalStatus.equals(RequestStatus.COMPLETE_STRING))
-                        || (auditApprovalStatus.equals(RequestStatus.REJECTED_STRING))
-                        || (auditApprovalStatus.equals(RequestStatus.CANCELED_STRING))) {
+                if (auditApprovalStatus == RequestStatus.COMPLETE ||
+                        auditApprovalStatus == RequestStatus.REJECTED ||
+                        auditApprovalStatus == RequestStatus.CANCELED) {
                     auditMessage = CMS.getLogMessage(
                             LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED,
                             auditSubjectID,
@@ -855,7 +855,7 @@ public class CMCRevReqServlet extends CMSServlet {
                             auditSerialNumber,
                             auditRequestType,
                             auditReasonNum,
-                            auditApprovalStatus);
+                            auditApprovalStatus == null ? ILogger.SIGNED_AUDIT_EMPTY_VALUE : auditApprovalStatus.toString());
 
                     audit(auditMessage);
                 }
@@ -882,9 +882,9 @@ public class CMCRevReqServlet extends CMSServlet {
                 // message in the signed audit log file
                 // if and only if "auditApprovalStatus" is
                 // "complete", "revoked", or "canceled"
-                if ((auditApprovalStatus.equals(RequestStatus.COMPLETE_STRING))
-                        || (auditApprovalStatus.equals(RequestStatus.REJECTED_STRING))
-                        || (auditApprovalStatus.equals(RequestStatus.CANCELED_STRING))) {
+                if (auditApprovalStatus == RequestStatus.COMPLETE ||
+                        auditApprovalStatus == RequestStatus.REJECTED ||
+                        auditApprovalStatus == RequestStatus.CANCELED) {
                     auditMessage = CMS.getLogMessage(
                             LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED,
                             auditSubjectID,
@@ -893,7 +893,7 @@ public class CMCRevReqServlet extends CMSServlet {
                             auditSerialNumber,
                             auditRequestType,
                             auditReasonNum,
-                            auditApprovalStatus);
+                            auditApprovalStatus == null ? ILogger.SIGNED_AUDIT_EMPTY_VALUE : auditApprovalStatus.toString());
 
                     audit(auditMessage);
                 }
@@ -921,9 +921,9 @@ public class CMCRevReqServlet extends CMSServlet {
                 // message in the signed audit log file
                 // if and only if "auditApprovalStatus" is
                 // "complete", "revoked", or "canceled"
-                if ((auditApprovalStatus.equals(RequestStatus.COMPLETE_STRING))
-                        || (auditApprovalStatus.equals(RequestStatus.REJECTED_STRING))
-                        || (auditApprovalStatus.equals(RequestStatus.CANCELED_STRING))) {
+                if (auditApprovalStatus == RequestStatus.COMPLETE ||
+                        auditApprovalStatus == RequestStatus.REJECTED ||
+                        auditApprovalStatus == RequestStatus.CANCELED) {
                     auditMessage = CMS.getLogMessage(
                             LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED,
                             auditSubjectID,
@@ -932,7 +932,7 @@ public class CMCRevReqServlet extends CMSServlet {
                             auditSerialNumber,
                             auditRequestType,
                             auditReasonNum,
-                            auditApprovalStatus);
+                            auditApprovalStatus == null ? ILogger.SIGNED_AUDIT_EMPTY_VALUE : auditApprovalStatus.toString());
 
                     audit(auditMessage);
                 }
@@ -957,9 +957,9 @@ public class CMCRevReqServlet extends CMSServlet {
                 // message in the signed audit log file
                 // if and only if "auditApprovalStatus" is
                 // "complete", "revoked", or "canceled"
-                if ((auditApprovalStatus.equals(RequestStatus.COMPLETE_STRING))
-                        || (auditApprovalStatus.equals(RequestStatus.REJECTED_STRING))
-                        || (auditApprovalStatus.equals(RequestStatus.CANCELED_STRING))) {
+                if (auditApprovalStatus == RequestStatus.COMPLETE ||
+                        auditApprovalStatus == RequestStatus.REJECTED ||
+                        auditApprovalStatus == RequestStatus.CANCELED) {
                     auditMessage = CMS.getLogMessage(
                             LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED,
                             auditSubjectID,
@@ -968,7 +968,7 @@ public class CMCRevReqServlet extends CMSServlet {
                             auditSerialNumber,
                             auditRequestType,
                             auditReasonNum,
-                            auditApprovalStatus);
+                            auditApprovalStatus == null ? ILogger.SIGNED_AUDIT_EMPTY_VALUE : auditApprovalStatus.toString());
 
                     audit(auditMessage);
                 }
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java b/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java
index aac4315e7..be17272ec 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java
@@ -430,7 +430,7 @@ public class DoRevoke extends CMSServlet {
         String auditRequesterID = auditRequesterID(req);
         String auditSerialNumber = auditSerialNumber(eeSerialNumber);
         String auditRequestType = auditRequestType(reason);
-        String auditApprovalStatus = ILogger.SIGNED_AUDIT_EMPTY_VALUE;
+        RequestStatus auditApprovalStatus = null;
         String auditReasonNum = String.valueOf(reason);
 
         CMS.debug("DoRevoke: eeSerialNumber: " + eeSerialNumber + " auditSerialNumber: " + auditSerialNumber);
@@ -696,7 +696,7 @@ public class DoRevoke extends CMSServlet {
             mQueue.processRequest(revReq);
 
             // retrieve the request status
-            auditApprovalStatus = revReq.getRequestStatus().toString();
+            auditApprovalStatus = revReq.getRequestStatus();
 
             RequestStatus stat = revReq.getRequestStatus();
             String type = revReq.getRequestType();
@@ -747,12 +747,9 @@ public class DoRevoke extends CMSServlet {
                     // store a message in the signed audit log file
                     // if and only if "auditApprovalStatus" is
                     // "complete", "revoked", or "canceled"
-                    if ((auditApprovalStatus.equals(
-                                RequestStatus.COMPLETE_STRING)) ||
-                            (auditApprovalStatus.equals(
-                                    RequestStatus.REJECTED_STRING)) ||
-                            (auditApprovalStatus.equals(
-                                    RequestStatus.CANCELED_STRING))) {
+                    if (auditApprovalStatus == RequestStatus.COMPLETE ||
+                            auditApprovalStatus == RequestStatus.REJECTED ||
+                            auditApprovalStatus == RequestStatus.CANCELED) {
                         auditMessage = CMS.getLogMessage(
                                     LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED,
                                     auditSubjectID,
@@ -761,7 +758,7 @@ public class DoRevoke extends CMSServlet {
                                     auditSerialNumber,
                                     auditRequestType,
                                     auditReasonNum,
-                                    auditApprovalStatus);
+                                    auditApprovalStatus == null ? ILogger.SIGNED_AUDIT_EMPTY_VALUE : auditApprovalStatus.toString());
 
                         audit(auditMessage);
                     }
@@ -963,9 +960,9 @@ public class DoRevoke extends CMSServlet {
             // store a message in the signed audit log file
             // if and only if "auditApprovalStatus" is
             // "complete", "revoked", or "canceled"
-            if ((auditApprovalStatus.equals(RequestStatus.COMPLETE_STRING))
-                    || (auditApprovalStatus.equals(RequestStatus.REJECTED_STRING))
-                    || (auditApprovalStatus.equals(RequestStatus.CANCELED_STRING))) {
+            if (auditApprovalStatus == RequestStatus.COMPLETE ||
+                    auditApprovalStatus == RequestStatus.REJECTED ||
+                    auditApprovalStatus == RequestStatus.CANCELED) {
                 auditMessage = CMS.getLogMessage(
                             LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED,
                             auditSubjectID,
@@ -974,7 +971,7 @@ public class DoRevoke extends CMSServlet {
                             auditSerialNumber,
                             auditRequestType,
                             auditReasonNum,
-                            auditApprovalStatus);
+                            auditApprovalStatus == null ? ILogger.SIGNED_AUDIT_EMPTY_VALUE : auditApprovalStatus.toString());
 
                 audit(auditMessage);
             }
@@ -997,12 +994,9 @@ public class DoRevoke extends CMSServlet {
                 // message in the signed audit log file
                 // if and only if "auditApprovalStatus" is
                 // "complete", "revoked", or "canceled"
-                if ((auditApprovalStatus.equals(
-                            RequestStatus.COMPLETE_STRING)) ||
-                        (auditApprovalStatus.equals(
-                                RequestStatus.REJECTED_STRING)) ||
-                        (auditApprovalStatus.equals(
-                                RequestStatus.CANCELED_STRING))) {
+                if (auditApprovalStatus == RequestStatus.COMPLETE ||
+                        auditApprovalStatus == RequestStatus.REJECTED ||
+                        auditApprovalStatus == RequestStatus.CANCELED) {
                     auditMessage = CMS.getLogMessage(
                                 LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED,
                                 auditSubjectID,
@@ -1011,7 +1005,7 @@ public class DoRevoke extends CMSServlet {
                                 auditSerialNumber,
                                 auditRequestType,
                                 auditReasonNum,
-                                auditApprovalStatus);
+                                auditApprovalStatus == null ? ILogger.SIGNED_AUDIT_EMPTY_VALUE : auditApprovalStatus.toString());
 
                     audit(auditMessage);
                 }
@@ -1038,12 +1032,9 @@ public class DoRevoke extends CMSServlet {
                 // message in the signed audit log file
                 // if and only if "auditApprovalStatus" is
                 // "complete", "revoked", or "canceled"
-                if ((auditApprovalStatus.equals(
-                            RequestStatus.COMPLETE_STRING)) ||
-                        (auditApprovalStatus.equals(
-                                RequestStatus.REJECTED_STRING)) ||
-                        (auditApprovalStatus.equals(
-                                RequestStatus.CANCELED_STRING))) {
+                if (auditApprovalStatus == RequestStatus.COMPLETE ||
+                        auditApprovalStatus == RequestStatus.REJECTED ||
+                        auditApprovalStatus == RequestStatus.CANCELED) {
                     auditMessage = CMS.getLogMessage(
                                 LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED,
                                 auditSubjectID,
@@ -1052,7 +1043,7 @@ public class DoRevoke extends CMSServlet {
                                 auditSerialNumber,
                                 auditRequestType,
                                 auditReasonNum,
-                                auditApprovalStatus);
+                                auditApprovalStatus == null ? ILogger.SIGNED_AUDIT_EMPTY_VALUE : auditApprovalStatus.toString());
 
                     audit(auditMessage);
                 }
@@ -1080,12 +1071,9 @@ public class DoRevoke extends CMSServlet {
                 // message in the signed audit log file
                 // if and only if "auditApprovalStatus" is
                 // "complete", "revoked", or "canceled"
-                if ((auditApprovalStatus.equals(
-                            RequestStatus.COMPLETE_STRING)) ||
-                        (auditApprovalStatus.equals(
-                                RequestStatus.REJECTED_STRING)) ||
-                        (auditApprovalStatus.equals(
-                                RequestStatus.CANCELED_STRING))) {
+                if (auditApprovalStatus == RequestStatus.COMPLETE ||
+                        auditApprovalStatus == RequestStatus.REJECTED ||
+                        auditApprovalStatus == RequestStatus.CANCELED) {
                     auditMessage = CMS.getLogMessage(
                                 LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED,
                                 auditSubjectID,
@@ -1094,7 +1082,7 @@ public class DoRevoke extends CMSServlet {
                                 auditSerialNumber,
                                 auditRequestType,
                                 auditReasonNum,
-                                auditApprovalStatus);
+                                auditApprovalStatus == null ? ILogger.SIGNED_AUDIT_EMPTY_VALUE : auditApprovalStatus.toString());
 
                     audit(auditMessage);
                 }
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java b/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
index 35bdd5c8c..65abd8a22 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
@@ -325,7 +325,7 @@ public class DoRevokeTPS extends CMSServlet {
         String auditRequesterID = auditRequesterID(req);
         String auditSerialNumber = auditSerialNumber(null);
         String auditRequestType = auditRequestType(reason);
-        String auditApprovalStatus = ILogger.SIGNED_AUDIT_EMPTY_VALUE;
+        RequestStatus auditApprovalStatus = null;
         String auditReasonNum = String.valueOf(reason);
 
         if (revokeAll != null) {
@@ -499,7 +499,7 @@ public class DoRevokeTPS extends CMSServlet {
             mQueue.processRequest(revReq);
 
             // retrieve the request status
-            auditApprovalStatus = revReq.getRequestStatus().toString();
+            auditApprovalStatus = revReq.getRequestStatus();
 
             RequestStatus stat = revReq.getRequestStatus();
             String type = revReq.getRequestType();
@@ -550,12 +550,9 @@ public class DoRevokeTPS extends CMSServlet {
                     // store a message in the signed audit log file
                     // if and only if "auditApprovalStatus" is
                     // "complete", "revoked", or "canceled"
-                    if ((auditApprovalStatus.equals(
-                                RequestStatus.COMPLETE_STRING)) ||
-                            (auditApprovalStatus.equals(
-                                    RequestStatus.REJECTED_STRING)) ||
-                            (auditApprovalStatus.equals(
-                                    RequestStatus.CANCELED_STRING))) {
+                    if (auditApprovalStatus == RequestStatus.COMPLETE ||
+                            auditApprovalStatus == RequestStatus.REJECTED ||
+                            auditApprovalStatus == RequestStatus.CANCELED) {
                         auditMessage = CMS.getLogMessage(
                                     LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED,
                                     auditSubjectID,
@@ -564,7 +561,7 @@ public class DoRevokeTPS extends CMSServlet {
                                     auditSerialNumber,
                                     auditRequestType,
                                     auditReasonNum,
-                                    auditApprovalStatus);
+                                    auditApprovalStatus == null ? ILogger.SIGNED_AUDIT_EMPTY_VALUE : auditApprovalStatus.toString());
 
                         audit(auditMessage);
                     }
@@ -744,9 +741,9 @@ public class DoRevokeTPS extends CMSServlet {
             // store a message in the signed audit log file
             // if and only if "auditApprovalStatus" is
             // "complete", "revoked", or "canceled"
-            if ((auditApprovalStatus.equals(RequestStatus.COMPLETE_STRING))
-                    || (auditApprovalStatus.equals(RequestStatus.REJECTED_STRING))
-                    || (auditApprovalStatus.equals(RequestStatus.CANCELED_STRING))) {
+            if (auditApprovalStatus == RequestStatus.COMPLETE ||
+                    auditApprovalStatus == RequestStatus.REJECTED ||
+                    auditApprovalStatus == RequestStatus.CANCELED) {
                 auditMessage = CMS.getLogMessage(
                             LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED,
                             auditSubjectID,
@@ -755,7 +752,7 @@ public class DoRevokeTPS extends CMSServlet {
                             auditSerialNumber,
                             auditRequestType,
                             auditReasonNum,
-                            auditApprovalStatus);
+                            auditApprovalStatus == null ? ILogger.SIGNED_AUDIT_EMPTY_VALUE : auditApprovalStatus.toString());
 
                 audit(auditMessage);
             }
@@ -779,12 +776,9 @@ public class DoRevokeTPS extends CMSServlet {
                 // message in the signed audit log file
                 // if and only if "auditApprovalStatus" is
                 // "complete", "revoked", or "canceled"
-                if ((auditApprovalStatus.equals(
-                            RequestStatus.COMPLETE_STRING)) ||
-                        (auditApprovalStatus.equals(
-                                RequestStatus.REJECTED_STRING)) ||
-                        (auditApprovalStatus.equals(
-                                RequestStatus.CANCELED_STRING))) {
+                if (auditApprovalStatus == RequestStatus.COMPLETE ||
+                        auditApprovalStatus == RequestStatus.REJECTED ||
+                        auditApprovalStatus == RequestStatus.CANCELED) {
                     auditMessage = CMS.getLogMessage(
                                 LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED,
                                 auditSubjectID,
@@ -793,7 +787,7 @@ public class DoRevokeTPS extends CMSServlet {
                                 auditSerialNumber,
                                 auditRequestType,
                                 auditReasonNum,
-                                auditApprovalStatus);
+                                auditApprovalStatus == null ? ILogger.SIGNED_AUDIT_EMPTY_VALUE : auditApprovalStatus.toString());
 
                     audit(auditMessage);
                 }
@@ -821,12 +815,9 @@ public class DoRevokeTPS extends CMSServlet {
                 // message in the signed audit log file
                 // if and only if "auditApprovalStatus" is
                 // "complete", "revoked", or "canceled"
-                if ((auditApprovalStatus.equals(
-                            RequestStatus.COMPLETE_STRING)) ||
-                        (auditApprovalStatus.equals(
-                                RequestStatus.REJECTED_STRING)) ||
-                        (auditApprovalStatus.equals(
-                                RequestStatus.CANCELED_STRING))) {
+                if (auditApprovalStatus == RequestStatus.COMPLETE ||
+                        auditApprovalStatus == RequestStatus.REJECTED ||
+                        auditApprovalStatus == RequestStatus.CANCELED) {
                     auditMessage = CMS.getLogMessage(
                                 LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED,
                                 auditSubjectID,
@@ -835,7 +826,7 @@ public class DoRevokeTPS extends CMSServlet {
                                 auditSerialNumber,
                                 auditRequestType,
                                 auditReasonNum,
-                                auditApprovalStatus);
+                                auditApprovalStatus == null ? ILogger.SIGNED_AUDIT_EMPTY_VALUE : auditApprovalStatus.toString());
 
                     audit(auditMessage);
                 }
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java
index 5605acf6d..1f018261b 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java
@@ -249,7 +249,7 @@ public class DoUnrevoke extends CMSServlet {
         String auditRequesterID = auditRequesterID(req);
         String auditSerialNumber = auditSerialNumber(serialNumbers[0].toString());
         String auditRequestType = OFF_HOLD;
-        String auditApprovalStatus = ILogger.SIGNED_AUDIT_EMPTY_VALUE;
+        RequestStatus auditApprovalStatus = null;
         String auditReasonNum = String.valueOf(OFF_HOLD_REASON);
 
         try {
@@ -291,7 +291,7 @@ public class DoUnrevoke extends CMSServlet {
             mQueue.processRequest(unrevReq);
 
             // retrieve the request status
-            auditApprovalStatus = unrevReq.getRequestStatus().toString();
+            auditApprovalStatus = unrevReq.getRequestStatus();
 
             RequestStatus status = unrevReq.getRequestStatus();
             String type = unrevReq.getRequestType();
@@ -514,9 +514,9 @@ public class DoUnrevoke extends CMSServlet {
             // store a message in the signed audit log file
             // if and only if "auditApprovalStatus" is
             // "complete", "revoked", or "canceled"
-            if ((auditApprovalStatus.equals(RequestStatus.COMPLETE_STRING))
-                    || (auditApprovalStatus.equals(RequestStatus.REJECTED_STRING))
-                    || (auditApprovalStatus.equals(RequestStatus.CANCELED_STRING))) {
+            if (auditApprovalStatus == RequestStatus.COMPLETE ||
+                    auditApprovalStatus == RequestStatus.REJECTED ||
+                    auditApprovalStatus == RequestStatus.CANCELED) {
                 auditMessage = CMS.getLogMessage(
                             LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED,
                             auditSubjectID,
@@ -525,7 +525,7 @@ public class DoUnrevoke extends CMSServlet {
                             auditSerialNumber,
                             auditRequestType,
                             auditReasonNum,
-                            auditApprovalStatus);
+                            auditApprovalStatus == null ? ILogger.SIGNED_AUDIT_EMPTY_VALUE : auditApprovalStatus.toString());
 
                 audit(auditMessage);
             }
@@ -548,12 +548,9 @@ public class DoUnrevoke extends CMSServlet {
                 // message in the signed audit log file
                 // if and only if "auditApprovalStatus" is
                 // "complete", "revoked", or "canceled"
-                if ((auditApprovalStatus.equals(
-                            RequestStatus.COMPLETE_STRING)) ||
-                        (auditApprovalStatus.equals(
-                                RequestStatus.REJECTED_STRING)) ||
-                        (auditApprovalStatus.equals(
-                                RequestStatus.CANCELED_STRING))) {
+                if (auditApprovalStatus == RequestStatus.COMPLETE ||
+                        auditApprovalStatus == RequestStatus.REJECTED ||
+                        auditApprovalStatus == RequestStatus.CANCELED) {
                     auditMessage = CMS.getLogMessage(
                                 LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED,
                                 auditSubjectID,
@@ -562,7 +559,7 @@ public class DoUnrevoke extends CMSServlet {
                                 auditSerialNumber,
                                 auditRequestType,
                                 auditReasonNum,
-                                auditApprovalStatus);
+                                auditApprovalStatus == null ? ILogger.SIGNED_AUDIT_EMPTY_VALUE : auditApprovalStatus.toString());
 
                     audit(auditMessage);
                 }
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java
index 7916887f8..ff383bbb4 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java
@@ -246,7 +246,7 @@ public class DoUnrevokeTPS extends CMSServlet {
         String auditRequesterID = auditRequesterID(req);
         String auditSerialNumber = auditSerialNumber(serialNumbers[0].toString());
         String auditRequestType = OFF_HOLD;
-        String auditApprovalStatus = ILogger.SIGNED_AUDIT_EMPTY_VALUE;
+        RequestStatus auditApprovalStatus = null;
         String auditReasonNum = String.valueOf(OFF_HOLD_REASON);
 
         try {
@@ -286,7 +286,7 @@ public class DoUnrevokeTPS extends CMSServlet {
             mQueue.processRequest(unrevReq);
 
             // retrieve the request status
-            auditApprovalStatus = unrevReq.getRequestStatus().toString();
+            auditApprovalStatus = unrevReq.getRequestStatus();
 
             RequestStatus status = unrevReq.getRequestStatus();
             String type = unrevReq.getRequestType();
@@ -458,9 +458,9 @@ public class DoUnrevokeTPS extends CMSServlet {
             // store a message in the signed audit log file
             // if and only if "auditApprovalStatus" is
             // "complete", "revoked", or "canceled"
-            if ((auditApprovalStatus.equals(RequestStatus.COMPLETE_STRING))
-                    || (auditApprovalStatus.equals(RequestStatus.REJECTED_STRING))
-                    || (auditApprovalStatus.equals(RequestStatus.CANCELED_STRING))) {
+            if (auditApprovalStatus == RequestStatus.COMPLETE ||
+                    auditApprovalStatus == RequestStatus.REJECTED ||
+                    auditApprovalStatus == RequestStatus.CANCELED) {
                 auditMessage = CMS.getLogMessage(
                             LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED,
                             auditSubjectID,
@@ -469,7 +469,7 @@ public class DoUnrevokeTPS extends CMSServlet {
                             auditSerialNumber,
                             auditRequestType,
                             auditReasonNum,
-                            auditApprovalStatus);
+                            auditApprovalStatus == null ? ILogger.SIGNED_AUDIT_EMPTY_VALUE : auditApprovalStatus.toString());
 
                 audit(auditMessage);
             }
@@ -492,12 +492,9 @@ public class DoUnrevokeTPS extends CMSServlet {
                 // message in the signed audit log file
                 // if and only if "auditApprovalStatus" is
                 // "complete", "revoked", or "canceled"
-                if ((auditApprovalStatus.equals(
-                            RequestStatus.COMPLETE_STRING)) ||
-                        (auditApprovalStatus.equals(
-                                RequestStatus.REJECTED_STRING)) ||
-                        (auditApprovalStatus.equals(
-                                RequestStatus.CANCELED_STRING))) {
+                if (auditApprovalStatus == RequestStatus.COMPLETE ||
+                        auditApprovalStatus == RequestStatus.REJECTED ||
+                        auditApprovalStatus == RequestStatus.CANCELED) {
                     auditMessage = CMS.getLogMessage(
                                 LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED,
                                 auditSubjectID,
@@ -506,7 +503,7 @@ public class DoUnrevokeTPS extends CMSServlet {
                                 auditSerialNumber,
                                 auditRequestType,
                                 auditReasonNum,
-                                auditApprovalStatus);
+                                auditApprovalStatus == null ? ILogger.SIGNED_AUDIT_EMPTY_VALUE : auditApprovalStatus.toString());
 
                     audit(auditMessage);
                 }
diff --git a/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java b/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
index dc0b0c474..c3d36561d 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
@@ -1770,8 +1770,8 @@ public class CRSEnrollment extends HttpServlet {
                 crsResp.setPKIStatus(CRSPKIMessage.mStatus_FAILURE);
                 crsResp.setFailInfo(CRSPKIMessage.mFailInfo_badAlg);
             }
-        } else if (status.equals(RequestStatus.REJECTED_STRING) ||
-                 status.equals(RequestStatus.CANCELED_STRING)) {
+        } else if (status == RequestStatus.REJECTED ||
+                 status == RequestStatus.CANCELED) {
             crsResp.setPKIStatus(CRSPKIMessage.mStatus_FAILURE);
             crsResp.setFailInfo(CRSPKIMessage.mFailInfo_badRequest);
         } else { // not complete