Author: rjung
Date: Wed Nov 5 12:50:34 2008
New Revision: 711695
URL: http://svn.apache.org/viewvc?rev=711695&view=rev
Log:
Whitespace and indentation cleanup.
Modified:
tomcat/trunk/java/org/apache/catalina/manager/util/SessionUtils.java
Modified: tomcat/trunk/java/org/apache/catalina/manager/util/SessionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/util/SessionUtils.java?rev=711695&r1=711694&r2=711695&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/util/SessionUtils.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/util/SessionUtils.java Wed
Nov 5 12:50:34 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,7 +36,7 @@
public class SessionUtils {
/**
- *
+ *
*/
private SessionUtils() {
super();
@@ -71,92 +71,92 @@
* @return String
*/
public static Locale guessLocaleFromSession(final Session in_session) {
- return guessLocaleFromSession(in_session.getSession());
+ return guessLocaleFromSession(in_session.getSession());
}
public static Locale guessLocaleFromSession(final HttpSession in_session) {
- if (null == in_session) {
- return null;
- }
+ if (null == in_session) {
+ return null;
+ }
try {
Locale locale = null;
-
- // First search "known locations"
- for (int i = 0; i < LOCALE_TEST_ATTRIBUTES.length; ++i) {
- Object obj =
in_session.getAttribute(LOCALE_TEST_ATTRIBUTES[i]);
- if (null != obj && obj instanceof Locale) {
- locale = (Locale) obj;
- break;
- }
- obj =
in_session.getAttribute(LOCALE_TEST_ATTRIBUTES[i].toLowerCase());
- if (null != obj && obj instanceof Locale) {
- locale = (Locale) obj;
- break;
- }
- obj =
in_session.getAttribute(LOCALE_TEST_ATTRIBUTES[i].toUpperCase());
- if (null != obj && obj instanceof Locale) {
- locale = (Locale) obj;
- break;
- }
- }
-
- if (null != locale) {
- return locale;
- }
-
- // Tapestry 3.0: Engine stored in session under
"org.apache.tapestry.engine:" + config.getServletName()
- // TODO: Tapestry 4+
- {
- final List tapestryArray = new ArrayList();
- for (Enumeration enumeration =
in_session.getAttributeNames(); enumeration.hasMoreElements();) {
- String name = (String) enumeration.nextElement();
- if (name.indexOf("tapestry") > -1 &&
name.indexOf("engine") > -1 && null != in_session.getAttribute(name))
{//$NON-NLS-1$ //$NON-NLS-2$
- tapestryArray.add(in_session.getAttribute(name));
- }
- }
- if (tapestryArray.size() == 1) {
- // found a potential Engine! Let's call getLocale() on
it.
- Object probableEngine = tapestryArray.get(0);
- if (null != probableEngine) {
- try {
- Method readMethod =
probableEngine.getClass().getMethod("getLocale", null);//$NON-NLS-1$
- if (null != readMethod) {
- // Call the property getter and return the
value
- Object possibleLocale =
readMethod.invoke(probableEngine, null);
- if (null != possibleLocale &&
possibleLocale instanceof Locale) {
- locale = (Locale) possibleLocale;
- }
- }
- } catch (Exception e) {
- // stay silent
- }
- }
- }
- }
-
- if (null != locale) {
- return locale;
- }
-
- // Last guess: iterate over all attributes, to find a Locale
- // If there is only one, consider it to be /the/ locale
- {
- final List localeArray = new ArrayList();
- for (Enumeration enumeration =
in_session.getAttributeNames(); enumeration.hasMoreElements();) {
- String name = (String) enumeration.nextElement();
- Object obj = in_session.getAttribute(name);
- if (null != obj && obj instanceof Locale) {
- localeArray.add(obj);
- }
- }
- if (localeArray.size() == 1) {
- locale = (Locale) localeArray.get(0);
- }
- }
- return locale;
+ // First search "known locations"
+ for (int i = 0; i < LOCALE_TEST_ATTRIBUTES.length; ++i) {
+ Object obj =
in_session.getAttribute(LOCALE_TEST_ATTRIBUTES[i]);
+ if (null != obj && obj instanceof Locale) {
+ locale = (Locale) obj;
+ break;
+ }
+ obj =
in_session.getAttribute(LOCALE_TEST_ATTRIBUTES[i].toLowerCase());
+ if (null != obj && obj instanceof Locale) {
+ locale = (Locale) obj;
+ break;
+ }
+ obj =
in_session.getAttribute(LOCALE_TEST_ATTRIBUTES[i].toUpperCase());
+ if (null != obj && obj instanceof Locale) {
+ locale = (Locale) obj;
+ break;
+ }
+ }
+
+ if (null != locale) {
+ return locale;
+ }
+
+ // Tapestry 3.0: Engine stored in session under
"org.apache.tapestry.engine:" + config.getServletName()
+ // TODO: Tapestry 4+
+ {
+ final List tapestryArray = new ArrayList();
+ for (Enumeration enumeration = in_session.getAttributeNames();
enumeration.hasMoreElements();) {
+ String name = (String) enumeration.nextElement();
+ if (name.indexOf("tapestry") > -1 &&
name.indexOf("engine") > -1 && null != in_session.getAttribute(name))
{//$NON-NLS-1$ //$NON-NLS-2$
+ tapestryArray.add(in_session.getAttribute(name));
+ }
+ }
+ if (tapestryArray.size() == 1) {
+ // found a potential Engine! Let's call getLocale() on it.
+ Object probableEngine = tapestryArray.get(0);
+ if (null != probableEngine) {
+ try {
+ Method readMethod =
probableEngine.getClass().getMethod("getLocale", null);//$NON-NLS-1$
+ if (null != readMethod) {
+ // Call the property getter and return the
value
+ Object possibleLocale =
readMethod.invoke(probableEngine, null);
+ if (null != possibleLocale && possibleLocale
instanceof Locale) {
+ locale = (Locale) possibleLocale;
+ }
+ }
+ } catch (Exception e) {
+ // stay silent
+ }
+ }
+ }
+ }
+
+ if (null != locale) {
+ return locale;
+ }
+
+ // Last guess: iterate over all attributes, to find a Locale
+ // If there is only one, consider it to be /the/ locale
+ {
+ final List localeArray = new ArrayList();
+ for (Enumeration enumeration = in_session.getAttributeNames();
enumeration.hasMoreElements();) {
+ String name = (String) enumeration.nextElement();
+ Object obj = in_session.getAttribute(name);
+ if (null != obj && obj instanceof Locale) {
+ localeArray.add(obj);
+ }
+ }
+ if (localeArray.size() == 1) {
+ locale = (Locale) localeArray.get(0);
+ }
+ }
+
+ return locale;
} catch (IllegalStateException ise) {
- //ignore: invalidated session
- return null;
+ //ignore: invalidated session
+ return null;
}
}
@@ -166,102 +166,102 @@
* @return Object
*/
public static Object guessUserFromSession(final Session in_session) {
- if (null == in_session) {
- return null;
- }
- if (in_session.getPrincipal() != null) {
- return in_session.getPrincipal().getName();
- }
- HttpSession httpSession = in_session.getSession();
- try {
- Object user = null;
- // First search "known locations"
- for (int i = 0; i < USER_TEST_ATTRIBUTES.length; ++i) {
- Object obj =
httpSession.getAttribute(USER_TEST_ATTRIBUTES[i]);
- if (null != obj) {
- user = obj;
- break;
- }
- obj =
httpSession.getAttribute(USER_TEST_ATTRIBUTES[i].toLowerCase());
- if (null != obj) {
- user = obj;
- break;
- }
- obj =
httpSession.getAttribute(USER_TEST_ATTRIBUTES[i].toUpperCase());
- if (null != obj) {
- user = obj;
- break;
- }
- }
-
- if (null != user) {
- return user;
- }
-
- // Last guess: iterate over all attributes, to find a
java.security.Principal or javax.security.auth.Subject
- // If there is only one, consider it to be /the/ user
- {
- final List principalArray = new ArrayList();
- for (Enumeration enumeration =
httpSession.getAttributeNames(); enumeration.hasMoreElements();) {
- String name = (String) enumeration.nextElement();
- Object obj = httpSession.getAttribute(name);
- if (null != obj && (obj instanceof Principal || obj
instanceof Subject)) {
- principalArray.add(obj);
- }
- // This workaround for JDK 1.3 compatibility. For JDK
1.4+, use previous (commented) instanceof.
-// try {
-// Class subjectClass =
Class.forName("javax.security.auth.Subject", true,
Thread.currentThread().getContextClassLoader());
-// if (subjectClass.isInstance(obj)) {
-// principalArray.add(obj);
-// }
-// } catch (ClassNotFoundException cnfe) {
-// // This is JDK 1.3: javax.security.auth.Subject
does not exist; do nothing
-// }
- }
- if (principalArray.size() == 1) {
- user = principalArray.get(0);
- }
- }
-
- if (null != user) {
- return user;
- }
+ if (null == in_session) {
+ return null;
+ }
+ if (in_session.getPrincipal() != null) {
+ return in_session.getPrincipal().getName();
+ }
+ HttpSession httpSession = in_session.getSession();
+ try {
+ Object user = null;
+ // First search "known locations"
+ for (int i = 0; i < USER_TEST_ATTRIBUTES.length; ++i) {
+ Object obj = httpSession.getAttribute(USER_TEST_ATTRIBUTES[i]);
+ if (null != obj) {
+ user = obj;
+ break;
+ }
+ obj =
httpSession.getAttribute(USER_TEST_ATTRIBUTES[i].toLowerCase());
+ if (null != obj) {
+ user = obj;
+ break;
+ }
+ obj =
httpSession.getAttribute(USER_TEST_ATTRIBUTES[i].toUpperCase());
+ if (null != obj) {
+ user = obj;
+ break;
+ }
+ }
+
+ if (null != user) {
+ return user;
+ }
+
+ // Last guess: iterate over all attributes, to find a
java.security.Principal or javax.security.auth.Subject
+ // If there is only one, consider it to be /the/ user
+ {
+ final List principalArray = new ArrayList();
+ for (Enumeration enumeration =
httpSession.getAttributeNames(); enumeration.hasMoreElements();) {
+ String name = (String) enumeration.nextElement();
+ Object obj = httpSession.getAttribute(name);
+ if (null != obj && (obj instanceof Principal || obj
instanceof Subject)) {
+ principalArray.add(obj);
+ }
+ // This workaround for JDK 1.3 compatibility. For JDK
1.4+, use previous (commented) instanceof.
+// try {
+// Class subjectClass =
Class.forName("javax.security.auth.Subject", true,
Thread.currentThread().getContextClassLoader());
+// if (subjectClass.isInstance(obj)) {
+// principalArray.add(obj);
+// }
+// } catch (ClassNotFoundException cnfe) {
+// // This is JDK 1.3: javax.security.auth.Subject does
not exist; do nothing
+// }
+ }
+ if (principalArray.size() == 1) {
+ user = principalArray.get(0);
+ }
+ }
+
+ if (null != user) {
+ return user;
+ }
- return user;
+ return user;
} catch (IllegalStateException ise) {
- //ignore: invalidated session
- return null;
+ //ignore: invalidated session
+ return null;
}
}
public static long getUsedTimeForSession(Session in_session) {
try {
- long diffMilliSeconds =
in_session.getLastAccessedTime() - in_session.getCreationTime();
- return diffMilliSeconds;
+ long diffMilliSeconds = in_session.getLastAccessedTime() -
in_session.getCreationTime();
+ return diffMilliSeconds;
} catch (IllegalStateException ise) {
- //ignore: invalidated session
- return -1;
- }
+ //ignore: invalidated session
+ return -1;
+ }
}
public static long getTTLForSession(Session in_session) {
try {
- long diffMilliSeconds =
(1000*in_session.getMaxInactiveInterval()) - (System.currentTimeMillis() -
in_session.getLastAccessedTime());
- return diffMilliSeconds;
+ long diffMilliSeconds = (1000*in_session.getMaxInactiveInterval())
- (System.currentTimeMillis() - in_session.getLastAccessedTime());
+ return diffMilliSeconds;
} catch (IllegalStateException ise) {
- //ignore: invalidated session
- return -1;
- }
+ //ignore: invalidated session
+ return -1;
+ }
}
public static long getInactiveTimeForSession(Session in_session) {
try {
- long diffMilliSeconds = System.currentTimeMillis() -
in_session.getLastAccessedTime();
- return diffMilliSeconds;
+ long diffMilliSeconds = System.currentTimeMillis() -
in_session.getLastAccessedTime();
+ return diffMilliSeconds;
} catch (IllegalStateException ise) {
- //ignore: invalidated session
- return -1;
- }
+ //ignore: invalidated session
+ return -1;
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
