Fixed bugzilla bug #673638.

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1843 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

1 files changed, 11 insertions, 3 deletions

diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
index cbc509a89..539a2eb0c 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
@@ -947,6 +947,7 @@ public class DatabasePanel extends WizardPanelBase {
            */
           String wait_dn = cs.getString("preop.internaldb.wait_dn", "");
           if (!wait_dn.equals("")) {
+            int i = 0;
             LDAPEntry task = null;
             boolean taskComplete = false;
             CMS.debug("Checking wait_dn " + wait_dn);
@@ -964,10 +965,17 @@ public class DatabasePanel extends WizardPanelBase {
                        } 
                    } 
                 }
-              } catch (LDAPException e) {
+              } catch (LDAPException le) {
+                CMS.debug("Still checking wait_dn '" + wait_dn + "' (" + le.toString() + ")");
+              } catch (Exception e) {
+                CMS.debug("Still checking wait_dn '" + wait_dn + "' (" + e.toString() + ").");
               }
-            } while (!taskComplete);
-            CMS.debug("Done checking wait_dn " + wait_dn);
+            } while ((!taskComplete) && (i < 20));
+            if (i < 20) {
+              CMS.debug("Done checking wait_dn " + wait_dn);
+            } else {
+              CMS.debug("Done checking wait_dn " + wait_dn + " due to timeout.");
+            }
           }
 
           conn.disconnect();