Dead code removal

This patch removes all of the locations that Eclipse identified as Dead code.
Only the Eclipse automated cleanups were performed,  which means that some of the locations which were in *if* blocks still have the corresponding brackets around them.
These ensure that the original variable semantics weren't changed,  but are safe to remove in the future.

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

18 files changed, 12 insertions, 222 deletions

diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java
index 5461e8ff..9b6f50b4 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java
@@ -1523,8 +1523,6 @@ public class CAAdminServlet extends AdminServlet {
          */
         IConfigStore eeConfig = null;
 
-        if (eeGateway != null) 
-            eeConfig = eeGateway.getConfigStore();
         IConfigStore caConfig = mCA.getConfigStore();
 
         Enumeration enum1 = req.getParameterNames();
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
index 67f63346..31665472 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
@@ -1998,111 +1998,6 @@ public class LogAdminServlet extends AdminServlet {
             }
             // initialize the log
 
-            try {
-                if (false) {
-                    newMgrInst.init(mSys, substore);
-				}
-            } catch (EBaseException e) {
-                // check to see if the log file path parameter was changed
-                newLogPath = auditCheckLogPath(req);
-
-                // check to see if the log expiration time parameter was changed
-                // newExpirationTime = auditCheckLogExpirationTime(req);
-
-                // don't commit in this case and cleanup the new substore.
-                restore(instancesConfig, id, saveParams);
-
-                // store a message in the signed audit log file
-                // (regardless of logType)
-                if (!(newLogPath.equals(origLogPath))) {
-                    auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE,
-                                auditSubjectID,
-                                ILogger.FAILURE,
-                                logType,
-                                newLogPath);
-
-                    audit(auditMessage);
-                }
-
-                // store a message in the signed audit log file
-                // (regardless of logType)
-                /* if (!(newExpirationTime.equals(origExpirationTime))) {
-                    auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_LOG_EXPIRATION_CHANGE,
-                                auditSubjectID,
-                                ILogger.FAILURE,
-                                logType,
-                                newExpirationTime);
-
-                    audit(auditMessage);
-                } */
-
-                // store a message in the signed audit log file
-                if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
-                    auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
-                                auditSubjectID,
-                                ILogger.FAILURE,
-                                auditParams(req));
-
-                    audit(auditMessage);
-                }
-
-                sendResponse(ERROR, e.toString(getLocale(req)), null, 
-                    resp);
-                return;
-            } catch (Throwable e) {
-                // check to see if the log file path parameter was changed
-                newLogPath = auditCheckLogPath(req);
-
-                // check to see if the log expiration time parameter was changed
-                // newExpirationTime = auditCheckLogExpirationTime(req);
-
-                restore(instancesConfig, id, saveParams);
-
-                // store a message in the signed audit log file
-                // (regardless of logType)
-                if (!(newLogPath.equals(origLogPath))) {
-                    auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE,
-                                auditSubjectID,
-                                ILogger.FAILURE,
-                                logType,
-                                newLogPath);
-
-                    audit(auditMessage);
-                }
-
-                // store a message in the signed audit log file
-                // (regardless of logType)
-                /* if (!(newExpirationTime.equals(origExpirationTime))) {
-                    auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_LOG_EXPIRATION_CHANGE,
-                                auditSubjectID,
-                                ILogger.FAILURE,
-                                logType,
-                                newExpirationTime);
-
-                    audit(auditMessage);
-                } */
-
-                // store a message in the signed audit log file
-                if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
-                    auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
-                                auditSubjectID,
-                                ILogger.FAILURE,
-                                auditParams(req));
-
-                    audit(auditMessage);
-                }
-
-                sendResponse(ERROR, e.toString(), null, 
-                    resp);
-                return;
-            }
-
             // initialized ok.  commiting
             try {
                 mConfig.commit(true);
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java b/pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
index 57ad7737..cd3326fb 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
@@ -294,7 +294,7 @@ CMS.debug("**** mFormPath = "+mFormPath);
                 EBaseException ee = new EBaseException("No matched certificate is found");
 
                 cmsReq.setError(ee);
-            } else if (error == null) {
+            } else {
                 String xmlOutput = req.getParameter("xml");
                 if (xmlOutput != null && xmlOutput.equals("true")) {
                   outputXML(resp, argSet);
@@ -303,9 +303,6 @@ CMS.debug("**** mFormPath = "+mFormPath);
                   form.renderOutput(out, argSet);
                   cmsReq.setStatus(CMSRequest.SUCCESS);
                 }
-            } else {
-                cmsReq.setStatus(CMSRequest.ERROR);
-                cmsReq.setError(error);
             }
         } catch (IOException e) {
             log(ILogger.LL_FAILURE,
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java b/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
index 5218233f..0b576795 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
@@ -275,7 +275,7 @@ public class ChallengeRevocationServlet1 extends CMSServlet {
                 EBaseException ee = new EBaseException("No matched certificate is found");
 
                 cmsReq.setError(ee);
-            } else if (error == null) {
+            } else {
                 String xmlOutput = req.getParameter("xml");
                 if (xmlOutput != null && xmlOutput.equals("true")) {
                   outputXML(resp, argSet);
@@ -284,9 +284,6 @@ public class ChallengeRevocationServlet1 extends CMSServlet {
                   form.renderOutput(out, argSet);
                   cmsReq.setStatus(CMSRequest.SUCCESS);
                 }
-            } else {
-                cmsReq.setStatus(CMSRequest.ERROR);
-                cmsReq.setError(error);
             }
         } catch (IOException e) {
             log(ILogger.LL_FAILURE,
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java b/pki/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java
index c9fcf25b..0bc7e206 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java
@@ -124,7 +124,7 @@ public class CloneRedirect extends CMSServlet {
         try {
             ServletOutputStream out = resp.getOutputStream();
 
-            if (error == null) {
+            {
                 String xmlOutput = req.getParameter("xml");
                 if (xmlOutput != null && xmlOutput.equals("true")) {
                   outputXML(resp, argSet);
@@ -133,9 +133,6 @@ public class CloneRedirect extends CMSServlet {
                   form.renderOutput(out, argSet);
                   cmsReq.setStatus(CMSRequest.SUCCESS);
                 }
-            } else {
-                cmsReq.setStatus(CMSRequest.ERROR);
-                cmsReq.setError(error);
             }
         } catch (IOException e) {
             log(ILogger.LL_FAILURE, 
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java b/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
index 817bf01e..94c4738c 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
@@ -149,7 +149,7 @@ public class DisplayCRL extends CMSServlet {
         try {
             ServletOutputStream out = resp.getOutputStream();
 
-            if (error == null) {
+            {
                 String xmlOutput = req.getParameter("xml");
                 if (xmlOutput != null && xmlOutput.equals("true")) {
                   outputXML(resp, argSet);
@@ -158,9 +158,6 @@ public class DisplayCRL extends CMSServlet {
                   form.renderOutput(out, argSet);
                   cmsReq.setStatus(CMSRequest.SUCCESS);
                 }
-            } else {
-                cmsReq.setStatus(CMSRequest.ERROR);
-                cmsReq.setError(error);
             }
         } catch (IOException e) {
             log(ILogger.LL_FAILURE, 
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java b/pki/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java
index cad231ed..cb83351a 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java
@@ -258,13 +258,6 @@ CMS.debug("**** mFormPath before getTemplate = "+mFormPath);
                 cmsReq.setStatus(CMSRequest.ERROR);
                 return;
             }
-            if (crl == null) {
-                log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_FAILED_DECODE_CRL"));
-                cmsReq.setError(new ECMSGWException(
-                  CMS.getUserMessage("CMS_GW_DECODE_CRL_FAILED")));
-                cmsReq.setStatus(CMSRequest.ERROR);
-                return;
-            }
             if ((op.equals("importDeltaCRL") || (op.equals("displayCRL") &&
                  crlDisplayType != null && crlDisplayType.equals("deltaCRL"))) &&
                   ((!(crlIP != null && crlIP.isThisCurrentDeltaCRL(crl))) &&
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java b/pki/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
index c6c0c495..24dda2a5 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
@@ -415,16 +415,6 @@ public class HashEnrollServlet extends CMSServlet {
             // }
         }
 
-        if (certAuthEnroll == true) {
-            // log(ILogger.LL_DEBUG, "just gotten subjectDN and serialNumber from ssl client cert");
-            if (authToken == null) {
-                // authToken is null, can't match to anyone; bail!
-                log(ILogger.LL_FAILURE, 
-                    CMS.getLogMessage("CMSGW_ERR_PROCESS_ENROLL_NO_AUTH"));
-                return;
-            }
-        }
-
         // fill certInfo from input types: keygen, cmc, pkcs10 or crmf
         KeyGenInfo keyGenInfo = 
             httpParams.getValueAsKeyGenInfo(SUBJECT_KEYGEN_INFO, null);	
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java b/pki/base/common/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java
index 4931d786..03cb83f6 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java
@@ -555,8 +555,6 @@ public class CMCOutputTemplate {
                         } catch (EBaseException ee) {
                             CMS.debug("CMCOutputTemplate: Certificate in the confirm acceptance control was not found");
                         }
-                        if (impl != null)
-                            confirmAccepted = true;
                     }
                     CMCStatusInfo cmcStatusInfo = null;
                     if (confirmAccepted) {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java
index a3198414..d8db2f66 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java
@@ -156,7 +156,7 @@ public class ConfigHSMLoginPanel extends WizardPanelBase {
 
         password = new Password(tokPwd.toCharArray());
 
-        if (password != null) {
+        {
             try {
                 if (token.passwordIsInitialized()) {
                     CMS.debug(
@@ -188,10 +188,6 @@ public class ConfigHSMLoginPanel extends WizardPanelBase {
                 context.put("errorString", e.toString());
                 rv = false;
             }
-        } else { // no password in password file, get from user
-            CMS.debug(
-                    "ConfigHSMLoginPanel:  loginToken():no password in cache, getting from user");
-            rv = false;
         }
         return rv;
     }
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java
index 962f87bf..43f3f956 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java
@@ -249,13 +249,10 @@ public class GetCookie extends CMSServlet {
                         try {
                             ServletOutputStream out = httpResp.getOutputStream();
 
-                            if (error == null) {
+                            {
                                 cmsReq.setStatus(CMSRequest.SUCCESS);
                                 httpResp.setContentType("text/html");
                                 form.renderOutput(out, argSet);
-                            } else {
-                                cmsReq.setStatus(CMSRequest.ERROR);
-                                cmsReq.setError(error);
                             }
                         } catch (IOException e) {
                             log(ILogger.LL_FAILURE,
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java
index efb76596..b0eff440 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java
@@ -85,13 +85,10 @@ public class MainPageServlet extends CMSServlet {
         try {
             ServletOutputStream out = response.getOutputStream();
 
-            if (error == null) {
+            {
                 cmsReq.setStatus(CMSRequest.SUCCESS);
                 response.setContentType("text/html");
                 form.renderOutput(out, argSet);
-            } else {
-                cmsReq.setStatus(CMSRequest.ERROR);
-                cmsReq.setError(error);
             }
         } catch (IOException e) {
             log(ILogger.LL_FAILURE,
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java
index cf0f3a09..b2bf21be 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java
@@ -180,36 +180,14 @@ public class UpdateNumberRange extends CMSServlet {
 
             String endNumStr = cs.getString(endNumConfig, "");
             endNum = new BigInteger(endNumStr, radix);
-            if ( endNum == null ) {
-                CMS.debug( "UpdateNumberRange::process() - " +
-                           "request endNum is null!" );
-                return;
-            }
-
             String decrementStr = cs.getString(cloneNumConfig, "");
             BigInteger decrement = new BigInteger(decrementStr, radix);
-            if (decrement == null) {
-                CMS.debug("UpdateNumberRange::process() - " +
-                           "request decrement string is null!" );
-                return;
-            }
-  
             beginNum = endNum.subtract(decrement).add(oneNum);
 
             if (beginNum.compareTo(repo.getTheSerialNumber()) < 0) {
                 String nextEndNumStr = cs.getString(nextEndConfig, "");
                 BigInteger endNum2 = new BigInteger(nextEndNumStr, radix);
-                if (endNum2 == null) {
-                    CMS.debug("UpdateNumberRange::process() - " +
-                        "Unused requests less than cloneTransferNumber!" );
-                    auditMessage = CMS.getLogMessage(
-                                       LOGGING_SIGNED_AUDIT_CONFIG_SERIAL_NUMBER,
-                                       auditSubjectID,
-                                       ILogger.FAILURE,
-                                       auditParams);
-                    audit(auditMessage);
-                    return;
-                } else {
+                {
                     CMS.debug("Transferring from the end of on-deck range");
                     String newValStr = endNum2.subtract(decrement).toString(radix);
                     repo.setNextMaxSerial(newValStr);
@@ -237,18 +215,6 @@ public class UpdateNumberRange extends CMSServlet {
                 return;
             }
 
-            if( endNum == null ) {
-                CMS.debug( "UpdateNumberRange::process() - " +
-                           "endNum is null!" );
-                auditMessage = CMS.getLogMessage(
-                                   LOGGING_SIGNED_AUDIT_CONFIG_SERIAL_NUMBER,
-                                   auditSubjectID,
-                                   ILogger.FAILURE,
-                                   auditParams);
-                audit(auditMessage);
-                return;
-            }
-
             // Enable serial number management in master for certs and requests
             if (type.equals("replicaId")) {
                repo.setEnableSerialMgmt(true);
diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java b/pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java
index e0823d66..939a0af7 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java
@@ -292,7 +292,7 @@ public class AddCAServlet extends CMSServlet {
             ServletOutputStream out = resp.getOutputStream();
             String error = null;
 
-            if (error == null) {
+            {
                 String xmlOutput = req.getParameter("xml");
                 if (xmlOutput != null && xmlOutput.equals("true")) {
                   outputXML(resp, argSet);
@@ -301,9 +301,6 @@ public class AddCAServlet extends CMSServlet {
                   form.renderOutput(out, argSet);
                   cmsReq.setStatus(CMSRequest.SUCCESS);
                 }
-            } else {
-                cmsReq.setStatus(CMSRequest.ERROR);
-                //  cmsReq.setError(error);
             }
         } catch (IOException e) {
             log(ILogger.LL_FAILURE,
diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java b/pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java
index ac2f9464..356acd4b 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java
@@ -311,22 +311,6 @@ public class AddCRLServlet extends CMSServlet {
             log(ILogger.LL_INFO, "AddCRLServlet: CRL Issuer DN " + 
                 crl.getIssuerDN().getName());
 
-            // update the CRLIssuingPoint record
-            if (crl == null) {
-                // error
-
-                // store a message in the signed audit log file
-                auditMessage = CMS.getLogMessage(
-                    LOGGING_SIGNED_AUDIT_CRL_VALIDATION,
-                    auditSubjectID,
-                    ILogger.FAILURE );
-
-                audit( auditMessage );
-
-                throw new ECMSGWException(
-                    CMS.getUserMessage("CMS_GW_DECODING_CRL_ERROR"));
-            }
-
             ICRLIssuingPointRecord pt = null;
 
             try {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java b/pki/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java
index 1948d06c..57ec1cc8 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java
@@ -196,7 +196,7 @@ public class CheckCertServlet extends CMSServlet {
             ServletOutputStream out = resp.getOutputStream();
             String error = null;
 
-            if (error == null) {
+            {
                 String xmlOutput = req.getParameter("xml");
                 if (xmlOutput != null && xmlOutput.equals("true")) {
                   outputXML(resp, argSet);
@@ -205,9 +205,6 @@ public class CheckCertServlet extends CMSServlet {
                   form.renderOutput(out, argSet);
                   cmsReq.setStatus(CMSRequest.SUCCESS);
                 }
-            } else {
-                cmsReq.setStatus(CMSRequest.ERROR);
-                //  cmsReq.setError(error);
             }
         } catch (IOException e) {
             log(ILogger.LL_FAILURE,
diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java b/pki/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java
index 9c36b18e..931031a7 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java
@@ -180,7 +180,7 @@ public class ListCAServlet extends CMSServlet {
             ServletOutputStream out = resp.getOutputStream();
             String error = null;
 
-            if (error == null) {
+            {
                 String xmlOutput = req.getParameter("xml");
                 if (xmlOutput != null && xmlOutput.equals("true")) {
                   outputXML(resp, argSet);
@@ -189,9 +189,6 @@ public class ListCAServlet extends CMSServlet {
                   form.renderOutput(out, argSet);
                   cmsReq.setStatus(CMSRequest.SUCCESS);
                 }
-            } else {
-                cmsReq.setStatus(CMSRequest.ERROR);
-                //  cmsReq.setError(error);
             }
         } catch (IOException e) {
             log(ILogger.LL_FAILURE,
diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java b/pki/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java
index 2e0b007a..bc9612e4 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java
@@ -198,7 +198,7 @@ public class RemoveCAServlet extends CMSServlet {
             ServletOutputStream out = resp.getOutputStream();
             String error = null;
 
-            if (error == null) {
+            {
                 String xmlOutput = req.getParameter("xml");
                 if (xmlOutput != null && xmlOutput.equals("true")) {
                   outputXML(resp, argSet);
@@ -207,9 +207,6 @@ public class RemoveCAServlet extends CMSServlet {
                   form.renderOutput(out, argSet);
                   cmsReq.setStatus(CMSRequest.SUCCESS);
                 }
-            } else {
-                cmsReq.setStatus(CMSRequest.ERROR);
-                //  cmsReq.setError(error);
             }
         } catch (IOException e) {
             log(ILogger.LL_FAILURE,