diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-07-05 10:22:37 -0400 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-07-10 14:23:18 -0500 |
| commit | f65eae145ca6720fab774600ddda2b04f364dda0 (patch) | |
| tree | 05b90f929c4a1b8193a64a3c79cbda09e1b85492 /base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java | |
| parent | a3c83b5f63c9ced5c527cb3b9306d390c3d192ec (diff) | |
| download | pki-f65eae145ca6720fab774600ddda2b04f364dda0.tar.gz pki-f65eae145ca6720fab774600ddda2b04f364dda0.tar.xz pki-f65eae145ca6720fab774600ddda2b04f364dda0.zip | |
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
Diffstat (limited to 'base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java')
| -rw-r--r-- | base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java | 23 |
1 files changed, 10 insertions, 13 deletions
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); } |