Fix update for bugzilla bub #649343.

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

2 files changed, 7 insertions, 3 deletions

diff --git a/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java b/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java
index 956a30e26..a2704eed1 100644
--- a/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java
+++ b/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java
@@ -175,7 +175,7 @@ public class ARequestNotifier implements IRequestNotifier {
 
     private Object publishingCounterMonitor = new Object();
 
-    private void updatePublishingStatus(String id) {
+    public void updatePublishingStatus(String id) {
         if (mRequestQueue != null) {
             synchronized (publishingCounterMonitor) {
                 if (mSavePublishingCounter == 0) {
@@ -265,7 +265,7 @@ public class ARequestNotifier implements IRequestNotifier {
                         r = mRequestQueue.findRequest(new RequestId(id));
                         mRequests.remove(0);
                         CMS.debug("getRequest  request "+ id + ((r != null)?" found":" not found"));
-                        updatePublishingStatus(id);
+                        //updatePublishingStatus(id);
                     } catch (EBaseException e) {
                         CMS.debug("getRequest  EBaseException " + e.toString());
                     }
@@ -518,12 +518,15 @@ class RunListeners implements Runnable {
         do {
             if (mRequestNotifier != null) mRequest = (IRequest)mRequestNotifier.getRequest();
             if (mListeners != null && mRequest != null) {
-                CMS.debug("RunListeners: mRequest = " + mRequest.getRequestId().toString());
                 while (mListeners.hasMoreElements()) {
                     IRequestListener l = (IRequestListener) mListeners.nextElement();
                     CMS.debug("RunListeners: IRequestListener = " + l.getClass().getName());
                     l.accept(mRequest);
                 }
+                if (mRequestNotifier != null) {
+                    CMS.debug("RunListeners: mRequest = " + mRequest.getRequestId().toString());
+                    mRequestNotifier.updatePublishingStatus(mRequest.getRequestId().toString());
+                }
             }
             CMS.debug("RunListeners: "+((mRequestNotifier != null && mRequestNotifier.getNumberOfRequests() > 0)?" Queue: "+mRequestNotifier.getNumberOfRequests():" noQueue")+
                       " "+((mRequest != null)?" SingleRequest":" noSingleRequest"));
diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java b/pki/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java
index 91cb7544a..7cf31557f 100644
--- a/pki/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java
+++ b/pki/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java
@@ -129,4 +129,5 @@ public interface IRequestNotifier extends INotify {
                                     int publishingQueuePageSize,
                                     int savePublishingStatus);
 
+    public void updatePublishingStatus(String id);
 }