Unreachable Catch clauses

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

2 files changed, 0 insertions, 33 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 0c596f3b0..50cfd7c5a 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 089967344..0f2a6ec71 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