diff options
| author | awnuk <awnuk@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-02-12 01:16:59 +0000 |
|---|---|---|
| committer | awnuk <awnuk@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-02-12 01:16:59 +0000 |
| commit | 286ce8ebf5d867e51aa998c63b8fea38ed9b8690 (patch) | |
| tree | 764bb5cc40ccb4bdb5ef7d52d4e56b2d8d4abc9f | |
| parent | a4d6d9a681e4a63e3346711a6b55831602c1e19e (diff) | |
| download | pki-286ce8ebf5d867e51aa998c63b8fea38ed9b8690.tar.gz pki-286ce8ebf5d867e51aa998c63b8fea38ed9b8690.tar.xz pki-286ce8ebf5d867e51aa998c63b8fea38ed9b8690.zip | |
Fixed bugzilla bug #673638.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1843 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
| -rw-r--r-- | pki/base/ca/shared/conf/vlvtasks.ldif | 2 | ||||
| -rw-r--r-- | pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java | 14 | ||||
| -rw-r--r-- | pki/base/kra/shared/conf/vlvtasks.ldif | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/pki/base/ca/shared/conf/vlvtasks.ldif b/pki/base/ca/shared/conf/vlvtasks.ldif index 2158fb12..5458e8a2 100644 --- a/pki/base/ca/shared/conf/vlvtasks.ldif +++ b/pki/base/ca/shared/conf/vlvtasks.ldif @@ -2,7 +2,7 @@ dn: cn=index1160589769, cn=index, cn=tasks, cn=config objectclass: top objectclass: extensibleObject cn: index1160589769 -ttl: 1 +ttl: 10 nsInstance: {database} nsIndexVLVAttribute: allCerts-{instanceId}Index nsIndexVLVAttribute: allExpiredCerts-{instanceId}Index 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 cbc509a8..539a2eb0 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(); diff --git a/pki/base/kra/shared/conf/vlvtasks.ldif b/pki/base/kra/shared/conf/vlvtasks.ldif index 014483ac..c8a27f17 100644 --- a/pki/base/kra/shared/conf/vlvtasks.ldif +++ b/pki/base/kra/shared/conf/vlvtasks.ldif @@ -2,7 +2,7 @@ dn: cn=index1160527115, cn=index, cn=tasks, cn=config objectclass: top objectclass: extensibleObject cn: index1160527115 -ttl: 1 +ttl: 10 nsInstance: {database} nsIndexVLVAttribute: allKeys-{instanceId}Index nsIndexVLVAttribute: kraAll-{instanceId}Index |