Refactored LDAPSecurityDomainSessionTable.

The LDAPSecurityDomainSessionTable has been modified to throw
an exception if there is a failure.

https://fedorahosted.org/pki/ticket/1633

2 files changed, 14 insertions, 15 deletions

diff --git a/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java b/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java
index 67cc7d163..99b15c77d 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java
@@ -44,17 +44,6 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import netscape.security.pkcs.ContentInfo;
-import netscape.security.pkcs.PKCS7;
-import netscape.security.pkcs.SignerInfo;
-import netscape.security.x509.AlgorithmId;
-import netscape.security.x509.CRLExtensions;
-import netscape.security.x509.CRLReasonExtension;
-import netscape.security.x509.CertificateChain;
-import netscape.security.x509.RevocationReason;
-import netscape.security.x509.RevokedCertImpl;
-import netscape.security.x509.X509CertImpl;
-
 import org.w3c.dom.Node;
 
 import com.netscape.certsrv.apps.CMS;
@@ -100,6 +89,17 @@ import com.netscape.cms.servlet.common.ServletUtils;
 import com.netscape.cmsutil.util.Utils;
 import com.netscape.cmsutil.xml.XMLObject;
 
+import netscape.security.pkcs.ContentInfo;
+import netscape.security.pkcs.PKCS7;
+import netscape.security.pkcs.SignerInfo;
+import netscape.security.x509.AlgorithmId;
+import netscape.security.x509.CRLExtensions;
+import netscape.security.x509.CRLReasonExtension;
+import netscape.security.x509.CertificateChain;
+import netscape.security.x509.RevocationReason;
+import netscape.security.x509.RevokedCertImpl;
+import netscape.security.x509.X509CertImpl;
+
 /**
  * This is the base class of all CS servlet.
  *
@@ -560,7 +560,7 @@ public abstract class CMSServlet extends HttpServlet {
      *             process the request
      */
     protected void process(CMSRequest cmsRequest)
-            throws EBaseException {
+            throws Exception {
     }
 
     /**
diff --git a/base/server/cms/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java
index 745962c72..27f478235 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java
@@ -28,7 +28,6 @@ import javax.servlet.http.HttpServletResponse;
 import org.w3c.dom.Node;
 
 import com.netscape.certsrv.apps.CMS;
-import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.base.IConfigStore;
 import com.netscape.certsrv.base.ISecurityDomainSessionTable;
 import com.netscape.cms.servlet.base.CMSServlet;
@@ -62,7 +61,7 @@ public class TokenAuthenticate extends CMSServlet {
      *
      * @param cmsReq the object holding the request and response information
      */
-    protected void process(CMSRequest cmsReq) throws EBaseException {
+    protected void process(CMSRequest cmsReq) throws Exception {
         HttpServletRequest httpReq = cmsReq.getHttpReq();
         HttpServletResponse httpResp = cmsReq.getHttpResp();
         IConfigStore config = CMS.getConfigStore();
@@ -82,7 +81,7 @@ public class TokenAuthenticate extends CMSServlet {
         String uid = "";
         String gid = "";
         CMS.debug("TokenAuthentication: checking session in the session table");
-        if (table.isSessionIdExist(sessionId)) {
+        if (table.sessionExists(sessionId)) {
             CMS.debug("TokenAuthentication: found session");
             if (checkIP) {
                 String hostname = table.getIP(sessionId);