The ConfigurationUtils.handleCerts() has been modified to log the
actual exception instead of showing the "deleteCert" operation
which may not be executed yet.

https://fedorahosted.org/pki/ticket/2457

Pushed to master under trivial rule.

--
Endi S. Dewata
>From 48090b00c3727c95ecd77b52272bd7596b3ff09b Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edew...@redhat.com>
Date: Thu, 5 Jan 2017 09:13:14 +0100
Subject: [PATCH] Fixed misleading error message on duplicate cert in HSM.

The ConfigurationUtils.handleCerts() has been modified to log the
actual exception instead of showing the "deleteCert" operation
which may not be executed yet.

https://fedorahosted.org/pki/ticket/2457
---
 .../src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
index dcccf4a6b6a968decf4f869b8bbbe75d0d8c823e..d018e9c1b373f218eca9b02ebd8d402c32ae8497 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
@@ -3240,7 +3240,7 @@ public class ConfigurationUtils {
                         deleteCert(tokenname, nickname);
                     }
                 } catch (Exception e) {
-                    CMS.debug("ConfigurationUtils: update (remote): deleteCert Exception=" + e.toString());
+                    CMS.debug(e);
                 }
 
                 CMS.debug("handleCerts(): importing new cert");
@@ -3309,8 +3309,8 @@ public class ConfigurationUtils {
                 if (findCertificate(tokenname, nickname)) {
                     deleteCert(tokenname, nickname);
                 }
-            } catch (Exception ee) {
-                CMS.debug("handleCerts(): deleteCert Exception=" + ee.toString());
+            } catch (Exception e) {
+                CMS.debug(e);
             }
 
             CMS.debug("handleCerts(): importing new cert");
-- 
2.5.5

_______________________________________________
Pki-devel mailing list
Pki-devel@redhat.com
https://www.redhat.com/mailman/listinfo/pki-devel

Reply via email to