From eb08fba8a15e044802e9fa32ba0d4ed6c8eb31bc Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Fri, 7 Jul 2017 17:23:54 +0200
Subject: Refactored ConfigurationUtils.updateServerCertNickConf().

The code that updates serverCertNick.conf has been moved into
ConfigurationUtils.updateServerCertNickConf() and will only be
executed once.

https://pagure.io/dogtagpki/issue/2280

Change-Id: Iaae4429724ece683939aea8defe6fceeca237c4b
---
 .../cms/src/org/dogtagpki/server/rest/SystemConfigService.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'base/server/cms/src/org')

diff --git a/base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java b/base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java
index 479d8dff8..87cf963d9 100644
--- a/base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java
+++ b/base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java
@@ -290,8 +290,12 @@ public class SystemConfigService extends PKIService implements SystemConfigResou
         return certList;
     }
 
-    public void processCerts(ConfigurationRequest request, String token, Collection<String> certList,
-            Collection<Cert> certs, MutableBoolean hasSigningCert) {
+    public void processCerts(
+            ConfigurationRequest request,
+            String token,
+            Collection<String> certList,
+            Collection<Cert> certs,
+            MutableBoolean hasSigningCert) throws Exception {
 
         try {
             boolean generateServerCert = !request.getGenerateServerCert().equalsIgnoreCase("false");
@@ -393,6 +397,8 @@ public class SystemConfigService extends PKIService implements SystemConfigResou
             CMS.debug(e);
             throw new PKIException("Error in setting certificate names and key sizes: " + e);
         }
+
+        ConfigurationUtils.updateServerCertNickConf();
     }
 
     public void processCert(
-- 
cgit