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 526e855e6..df5fe2cf0 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 06b5f2614..cc4298993 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 f0b8c49c2..feddc69ad 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();
     }
 
     /**