Move ARequestQueue.markAsServiced() to RequestQueue

dogtagpki · Apr 23, 2021 · 5203e26 · 5203e26
1 parent 48dc1ba
commit 5203e26
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 14 deletions.
diff --git a/base/ca/src/com/netscape/cmscore/connector/LocalConnector.java b/base/ca/src/com/netscape/cmscore/connector/LocalConnector.java
@@ -135,6 +135,15 @@ public void set(String name, String val) {
         }
 
         public void accept(IRequest destreq) {
+            try {
+                acceptImpl(destreq);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        public void acceptImpl(IRequest destreq) throws Exception {
+
             logger.debug("dest " + mDest.getId() + " done with " + destreq.getRequestId());
 
             CAEngine engine = CAEngine.getInstance();

diff --git a/base/server/src/com/netscape/cmscore/request/ARequestQueue.java b/base/server/src/com/netscape/cmscore/request/ARequestQueue.java
@@ -288,21 +288,9 @@ public IRequest cloneAndMarkPending(IRequest r)
      *
      * Caller must lock request and release request.
      *
-     * @param r request
+     * @param request request
      */
-    public final void markAsServiced(IRequest r) {
-        r.setRequestStatus(RequestStatus.COMPLETE);
-        try {
-            updateRequest(r);
-        } catch (EBaseException e) {
-            throw new RuntimeException(e);
-        }
-
-        if (mNotify != null)
-            mNotify.notify(r);
-
-        return;
-    }
+    public abstract void markAsServiced(IRequest request) throws EBaseException;
 
     /**
      * Returns an enumerator that lists all RequestIds in the

diff --git a/base/server/src/com/netscape/cmscore/request/RequestQueue.java b/base/server/src/com/netscape/cmscore/request/RequestQueue.java
@@ -217,6 +217,17 @@ public void approveRequest(IRequest request) throws EBaseException {
         stateEngine(request);
     }
 
+    public void markAsServiced(IRequest request) throws EBaseException {
+
+        request.setRequestStatus(RequestStatus.COMPLETE);
+
+        updateRequest(request);
+
+        if (mNotify != null) {
+            mNotify.notify(request);
+        }
+    }
+
     public RequestId findRequestBySourceId(String id) {
         IRequestList irl = findRequestsBySourceId(id);