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

4 files changed, 4 insertions, 48 deletions

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 a3198414a..d8db2f66a 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 962f87bff..43f3f956a 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 efb765966..b0eff4405 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 cf0f3a095..b2bf21be4 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);