From ff173996b9a7d2eedb5a31f8235e0de3b9c1adda Mon Sep 17 00:00:00 2001
From: Adam Young <ayoung@redhat.com>
Date: Wed, 16 Nov 2011 10:44:12 -0500
Subject: Unreachable Catch clauses

In each of the cases,  more specific exceptions would be caught, masking these more generic exception.
---
 .../src/com/netscape/cmscore/ldap/LdapPublishModule.java      | 10 ----------
 .../src/com/netscape/cmscore/security/JssSubsystem.java       |  3 ---
 .../src/com/netscape/cmscore/selftests/SelfTestSubsystem.java | 11 -----------
 3 files changed, 24 deletions(-)

(limited to 'pki/base/common/src/com/netscape/cmscore')

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 8e890f06b..e9839f595 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 d0df7d1a9..f15a4bc21 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 209be47df..ba3a8d550 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;
         }
     }
 
-- 
cgit