From d8c3b67372570fdca6624720862c3e1e2fb4de58 Mon Sep 17 00:00:00 2001 From: "harald.bratko" Date: Fri, 3 Feb 2006 10:27:32 +0000 Subject: Changed "enum" variable because it is a keyword within jdk1.5 git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@614 d688527b-c9ab-4aba-bd8d-4036d912da1d --- .../src/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java | 4 ++-- .../at/gv/egovernment/moa/id/auth/MOAIDAuthInitialiserTest.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'id.server') diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java b/id.server/src/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java index 95878007e..9884c80f8 100644 --- a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java +++ b/id.server/src/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java @@ -96,8 +96,8 @@ public class AuthServlet extends HttpServlet implements MOAIDAuthConstants { * Logs all servlet parameters for debugging purposes. */ protected void logParameters(HttpServletRequest req) { - for (Enumeration enum = req.getParameterNames(); enum.hasMoreElements(); ) { - String parname = (String)enum.nextElement(); + for (Enumeration params = req.getParameterNames(); params.hasMoreElements(); ) { + String parname = (String)params.nextElement(); Logger.debug("Parameter " + parname + req.getParameter(parname)); } } diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/MOAIDAuthInitialiserTest.java b/id.server/src/test/at/gv/egovernment/moa/id/auth/MOAIDAuthInitialiserTest.java index 4bc7d52d6..81cdfb9f8 100644 --- a/id.server/src/test/at/gv/egovernment/moa/id/auth/MOAIDAuthInitialiserTest.java +++ b/id.server/src/test/at/gv/egovernment/moa/id/auth/MOAIDAuthInitialiserTest.java @@ -28,9 +28,9 @@ public class MOAIDAuthInitialiserTest extends UnitTestCase { try { KeyStore s = KeyStoreUtils.loadKeyStore("pkcs12","file:C:/Programme/ApacheGroup/abnahme/cert/keystore.p12","changeit"); System.out.println(s.getProvider().getClass().getName()); - Enumeration enum = s.aliases(); - while (enum.hasMoreElements()) { - String element = (String) enum.nextElement(); + Enumeration aliases = s.aliases(); + while (aliases.hasMoreElements()) { + String element = (String) aliases.nextElement(); System.out.print(element+":"); System.out.println(s.getCertificate(element).getPublicKey().getAlgorithm()); System.out.println(s.getCertificate(element).getType()); -- cgit v1.2.3