Fix sorkey array control and TPS ActivityServlet

Sorkey array control generation get error when it is null. ActivityServlet reports wrong message when resource is not found
dogtagpki · Jun 6, 2024 · 841112b · 841112b
1 parent efc58e1
commit 841112b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/base/server/src/main/java/com/netscape/cmscore/dbs/LDAPPagedSearch.java b/base/server/src/main/java/com/netscape/cmscore/dbs/LDAPPagedSearch.java
@@ -61,8 +61,10 @@ public LDAPPagedSearch(Class<E> contentClassType, DBRegistry registry, LDAPConne
         this.base = base;
         this.filter = filter;
         this.attrs = attrs;
-        this.sortKeys = new String[1];
-        this.sortKeys[0] = sortKey;
+        if (sortKey != null) {
+            this.sortKeys = new String[1];
+            this.sortKeys[0] = sortKey;
+        }
         try {
             this.conn = (LDAPConnection) conn.clone();
         } catch (Exception e) {

diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/v2/ActivityServlet.java b/base/tps/src/main/java/org/dogtagpki/server/tps/v2/ActivityServlet.java
@@ -28,6 +28,7 @@
 
 import com.netscape.certsrv.base.BadRequestException;
 import com.netscape.certsrv.base.PKIException;
+import com.netscape.certsrv.base.ResourceNotFoundException;
 import com.netscape.certsrv.base.SessionContext;
 import com.netscape.certsrv.base.UnauthorizedException;
 import com.netscape.certsrv.logging.ActivityCollection;
@@ -65,10 +66,15 @@ public void get(HttpServletRequest request, HttpServletResponse response) throws
                 throw new BadRequestException("Id is empty");
             }
             logger.debug("{} (\"{}\")", method, id);
-            ActivityRecord aRec = database.getRecord(id);
+            ActivityRecord aRec = null;
+            try {
+                aRec = database.getRecord(id);
+            } catch (PKIException pe) {
+                throw new ResourceNotFoundException("Record " + id + " not found");
+            }
             if (aRec == null) {
                 logger.debug("{} record not found", method);
-                throw new PKIException(method + " record not found");
+                throw new ResourceNotFoundException("Record " + id + " not found");
             }
             String type = aRec.getType();