From 7d88f4ee050856b8fef5f260cfe1b3aeec201fda Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Mon, 9 Apr 2012 13:56:59 -0500
Subject: Removed unused private fields.

Most of unused private fields have been removed because they generate
warnings in Eclipse. Some are kept because it might be useful later.

Ticket #139
---
 .../src/com/netscape/cms/servlet/tks/TokenServlet.java | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'base/common/src/com/netscape/cms/servlet/tks')

diff --git a/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java b/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java
index ea0b10a67..ee6913acc 100644
--- a/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java
@@ -44,7 +44,6 @@ import com.netscape.certsrv.base.IConfigStore;
 import com.netscape.certsrv.base.IPrettyPrintFormat;
 import com.netscape.certsrv.base.SessionContext;
 import com.netscape.certsrv.logging.ILogger;
-import com.netscape.certsrv.tks.ITKSAuthority;
 import com.netscape.cms.servlet.base.CMSServlet;
 import com.netscape.cms.servlet.common.CMSRequest;
 import com.netscape.symkey.SessionKey;
@@ -66,13 +65,8 @@ public class TokenServlet extends CMSServlet {
     protected static final String TRANSPORT_KEY_NAME = "sharedSecret";
     private final static String INFO = "TokenServlet";
     public static int ERROR = 1;
-    private ITKSAuthority mTKS = null;
-    private String mSelectedToken = null;
-    private String mNewSelectedToken = null;
     String mKeyNickName = null;
     String mNewKeyNickName = null;
-    private final static String LOGGING_SIGNED_AUDIT_CONFIG_DRM =
-            "LOGGING_SIGNED_AUDIT_CONFIG_DRM_3";
     IPrettyPrintFormat pp = CMS.getPrettyPrintFormat(":");
 
     private final static String LOGGING_SIGNED_AUDIT_COMPUTE_SESSION_KEY_REQUEST =
@@ -177,9 +171,6 @@ public class TokenServlet extends CMSServlet {
             }
             CMS.debug("keySet selected: " + keySet);
 
-            mNewSelectedToken = null;
-
-            mSelectedToken = CMS.getConfigStore().getString("tks.defaultSlot");
             String masterKeyPrefix = CMS.getConfigStore().getString("tks.master_key_prefix", null);
             String temp = req.getParameter("KeyInfo"); //#xx#xx
             String keyInfoMap = "tks." + keySet + ".mk_mappings." + temp;
@@ -190,9 +181,7 @@ public class TokenServlet extends CMSServlet {
                 while (st.hasMoreTokens()) {
 
                     String currentToken = st.nextToken();
-                    if (tokenNumber == 0)
-                        mSelectedToken = currentToken;
-                    else if (tokenNumber == 1)
+                    if (tokenNumber == 1)
                         mKeyNickName = currentToken;
                     tokenNumber++;
 
@@ -208,9 +197,7 @@ public class TokenServlet extends CMSServlet {
                     int tokenNumber = 0;
                     while (st.hasMoreTokens()) {
                         String currentToken = st.nextToken();
-                        if (tokenNumber == 0)
-                            mNewSelectedToken = currentToken;
-                        else if (tokenNumber == 1)
+                        if (tokenNumber == 1)
                             mNewKeyNickName = currentToken;
                         tokenNumber++;
 
@@ -1314,7 +1301,6 @@ public class TokenServlet extends CMSServlet {
         }
 
         String temp = req.getParameter("card_challenge");
-        mSelectedToken = CMS.getConfigStore().getString("tks.defaultSlot");
         setDefaultSlotAndKeyName(req);
         if (temp != null) {
             processComputeSessionKey(req, resp);
-- 
cgit