summaryrefslogtreecommitdiffstats
path: root/pki
diff options
context:
space:
mode:
authorjmagne <jmagne@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2011-06-30 21:48:17 +0000
committerjmagne <jmagne@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2011-06-30 21:48:17 +0000
commitf0189237025c3dfd2137140915bfb48e743dafa5 (patch)
treeca7fd0c22231150084b263ac60e50e995a9fe132 /pki
parent71ffbcb306cdce3d307b3ca6eb3039ea5f65a008 (diff)
downloadpki-f0189237025c3dfd2137140915bfb48e743dafa5.tar.gz
pki-f0189237025c3dfd2137140915bfb48e743dafa5.tar.xz
pki-f0189237025c3dfd2137140915bfb48e743dafa5.zip
Bugzilla Bug #717813 - EV_AUDIT_LOG_SHUTDOWN audit log not generated for tps and ca on server shutdown
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@2033 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki')
-rw-r--r--pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java8
-rw-r--r--pki/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java4
-rw-r--r--pki/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java10
3 files changed, 10 insertions, 12 deletions
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java b/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java
index 526e855e..df5fe2cf 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java
+++ b/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java
@@ -1888,11 +1888,11 @@ public class CertificateRepository extends Repository
}
public void shutdown() {
- if (mCertStatusUpdateThread != null)
- mCertStatusUpdateThread.destroy();
+ //if (mCertStatusUpdateThread != null)
+ // mCertStatusUpdateThread.destroy();
- if (mRetrieveModificationsThread != null)
- mRetrieveModificationsThread.destroy();
+ //if (mRetrieveModificationsThread != null)
+ // mRetrieveModificationsThread.destroy();
}
}
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java b/pki/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java
index 06b5f261..cc429899 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java
+++ b/pki/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java
@@ -499,8 +499,8 @@ CMS.debug("filter= " + filter);
}
public void shutdown() {
- if (mKeyStatusUpdateThread != null)
- mKeyStatusUpdateThread.destroy();
+ //if (mKeyStatusUpdateThread != null)
+ // mKeyStatusUpdateThread.destroy();
}
}
diff --git a/pki/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java b/pki/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java
index f0b8c49c..feddc69a 100644
--- a/pki/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java
+++ b/pki/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java
@@ -436,17 +436,15 @@ public class JobsScheduler implements Runnable, IJobsScheduler {
while (enums.hasMoreElements()) {
String id = (String)enums.nextElement();
Thread currthread = (Thread)mJobThreads.get(id);
- if (currthread != null) {
- currthread.destroy();
- }
+ //if (currthread != null)
+ // currthread.destroy();
}
mJobThreads.clear();
mJobThreads = null;
- if (mScheduleThread != null) {
- mScheduleThread.destroy();
- }
+ //if (mScheduleThread != null)
+ // mScheduleThread.destroy();
}
/**