Unreachable Catch clauses

In each of the cases,  more specific exceptions would be caught, masking these more generic exception.

5 files changed, 0 insertions, 57 deletions

diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java
index 0c596f3b..50cfd7c5 100644
--- a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java
+++ b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java
@@ -317,10 +317,6 @@ public class LdapCertSubjPublisher implements ILdapPublisher {
         } catch (CertificateEncodingException e) {
             log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_UNPUBLISH_ERROR", e.toString()));
             throw new ELdapException(CMS.getUserMessage("CMS_LDAP_GET_DER_ENCODED_CERT_FAILED", e.toString()));
-        } catch (CertificateException e) {
-            log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_UNPUBLISH_ERROR", e.toString()));
-            throw new ELdapException(
-                    CMS.getUserMessage("CMS_LDAP_DECODING_CERT_FAILED", e.toString()));
         } catch (IOException e) {
             log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_UNPUBLISH_ERROR", e.toString()));
             throw new ELdapException(CMS.getUserMessage("CMS_LDAP_GET_LDAP_DN_STRING_FAILED", e.toString()));
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java
index 08996734..0f2a6ec7 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java
@@ -540,35 +540,6 @@ public class AdminServlet extends HttpServlet {
                 }
 
                 throw new IOException("authentication failed");
-            } catch (EBaseException e) {
-                mLogger.log(ILogger.EV_SYSTEM, ILogger.S_OTHER,
-                    ILogger.LL_FAILURE,
-                    CMS.getLogMessage("ADMIN_SRVLT_ERROR",
-                        e.toString()));
-
-                if (authType.equals("sslclientauth")) {
-                    // store a message in the signed audit log file
-                    auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_AUTH_FAIL,
-                                ILogger.UNIDENTIFIED,
-                                ILogger.FAILURE,
-                                CERTUSERDB,
-                                auditUID);
-
-                    audit(auditMessage);
-                } else {
-                    // store a message in the signed audit log file
-                    auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_AUTH_FAIL,
-                                ILogger.UNIDENTIFIED,
-                                ILogger.FAILURE,
-                                PASSWDUSERDB,
-                                auditUID);
-
-                    audit(auditMessage);
-                }
-
-                throw new IOException("authentication failed");
             }
 
             // build locale based on the client language
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java b/pki/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java
index 8e890f06..e9839f59 100644
--- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java
+++ b/pki/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java
@@ -726,11 +726,6 @@ class HandleRevocation implements IRequestListener {
                 mModule.log(ILogger.LL_FAILURE, 
 			CMS.getLogMessage("CMSCORE_LDAP_CERT_NOT_UNPUBLISH",
                     cert.getSerialNumber().toString(16), e.getMessage()));
-            } catch (EBaseException e) {
-                error = true;
-                mModule.log(ILogger.LL_FAILURE, 
-			CMS.getLogMessage("CMSCORE_LDAP_CERT_NOT_FIND",
-                    cert.getSerialNumber().toString(16), e.getMessage()));
             }
         }
         r.setExtData("ldapPublishStatus", results);
@@ -794,11 +789,6 @@ class HandleUnrevocation implements IRequestListener {
                 mModule.log(ILogger.LL_FAILURE, 
 			CMS.getLogMessage("CMSCORE_LDAP_CERT_NOT_UNPUBLISH",
                     certs[i].getSerialNumber().toString(16), e.getMessage()));
-            } catch (EBaseException e) {
-                error = true;
-                mModule.log(ILogger.LL_FAILURE, 
-			CMS.getLogMessage("CMSCORE_LDAP_CERT_NOT_FIND",
-                    certs[i].getSerialNumber().toString(16), e.getMessage()));
             }
         }
         r.setExtData("ldapPublishStatus", results);
diff --git a/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java b/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
index d0df7d1a..f15a4bc2 100644
--- a/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
+++ b/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
@@ -1719,9 +1719,6 @@ CMS.debug("*** removing this interna cert");
         } catch (IOException e) { 
             log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_SECURITY_DELETE_CERT", e.toString()));
             throw new EBaseException(CMS.getUserMessage("CMS_BASE_CERT_ERROR", e.toString()));
-        } catch (CertificateException e) {
-            log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_SECURITY_DELETE_CERT", e.toString()));
-            throw new EBaseException(CMS.getUserMessage("CMS_BASE_CERT_ERROR", e.toString()));
         }
     }
 
diff --git a/pki/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java b/pki/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
index 209be47d..ba3a8d55 100644
--- a/pki/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
+++ b/pki/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
@@ -952,17 +952,6 @@ public class SelfTestSubsystem
 
             // rethrow the specific exception to be handled later
             throw eAudit1;
-        } catch (ESelfTestException eAudit2) {
-            // store a message in the signed audit log file
-            auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION,
-                        ILogger.SYSTEM_UID,
-                        ILogger.FAILURE);
-
-            audit(auditMessage);
-
-            // rethrow the specific exception to be handled later
-            throw eAudit2;
         }
     }