Fix minor user creation issue

1 files changed, 11 insertions, 5 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 6f560b94b..e486555a9 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
@@ -3568,22 +3568,28 @@ public class ConfigurationUtils {
             certs[0] = new X509CertImpl(CMS.AtoB(b64));
             user.setX509Certificates(certs);
             try {
+                CMS.debug("setupClientAuthUser: adding user: " + id);
                 system.addUser(user);
             } catch (ConflictingOperationException e) {
-                // ignore if
+                // ignore exception
+                CMS.debug("setupClientAuthUser: User already exists: " + e);
+            }
+            try {
+                CMS.debug("setupClientAuthUser: Adding cert to user: " + id);
+                system.addUserCert(user);
+            } catch(ConflictingOperationException e) {
+                // ignore exception
+                CMS.debug("setupClientAuthUser: Cert already added: " + e);
             }
-            CMS.debug("DonePanel display: successfully add the user");
-            system.addUserCert(user);
-            CMS.debug("DonePanel display: successfully add the user certificate");
             cs.commit(false);
         }
 
         String groupName = "Trusted Managers";
         IGroup group = system.getGroupFromName(groupName);
         if (!group.isMember(id)) {
+            CMS.debug("setupClientAuthUser: adding user to the trusted managers group.");
             group.addMemberName(id);
             system.modifyGroup(group);
-            CMS.debug("DonePanel display: successfully added the user to the group.");
         }
 
     }