Author: markt
Date: Sun Jul 15 19:47:20 2012
New Revision: 1361776
URL: http://svn.apache.org/viewvc?rev=1361776&view=rev
Log:
Code clean-up for o.a.catalina.security
- Add final prompted by UCDetector
- Java 7 use of <>
Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java
tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java
tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java?rev=1361776&r1=1361775&r2=1361776&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java Sun Jul
15 19:47:20 2012
@@ -49,26 +49,31 @@ public final class SecurityConfig{
/**
* List of protected package from conf/catalina.properties
*/
- private String packageDefinition;
+ private final String packageDefinition;
/**
* List of protected package from conf/catalina.properties
*/
- private String packageAccess;
+ private final String packageAccess;
/**
* Create a single instance of this class.
*/
- private SecurityConfig(){
+ private SecurityConfig() {
+ String definition = null;
+ String access = null;
try{
- packageDefinition =
CatalinaProperties.getProperty("package.definition");
- packageAccess = CatalinaProperties.getProperty("package.access");
+ definition = CatalinaProperties.getProperty("package.definition");
+ access = CatalinaProperties.getProperty("package.access");
} catch (java.lang.Exception ex){
if (log.isDebugEnabled()){
log.debug("Unable to load properties using
CatalinaProperties", ex);
}
+ } finally {
+ packageDefinition = definition;
+ packageAccess = access;
}
}
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java?rev=1361776&r1=1361775&r2=1361776&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java Sun
Jul 15 19:47:20 2012
@@ -42,7 +42,7 @@ public class SecurityListener implements
/**
* The list of operating system users not permitted to run Tomcat.
*/
- private Set<String> checkedOsUsers = new HashSet<String>();
+ private final Set<String> checkedOsUsers = new HashSet<>();
/**
* The minimum umask that must be configured for the operating system user
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java?rev=1361776&r1=1361775&r2=1361776&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java (original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java Sun Jul 15
19:47:20 2012
@@ -69,12 +69,12 @@ public final class SecurityUtil{
* Cache every object for which we are creating method on it.
*/
private static final Map<Object,Method[]> objectCache =
- new ConcurrentHashMap<Object,Method[]>();
+ new ConcurrentHashMap<>();
private static final org.apache.juli.logging.Log log=
org.apache.juli.logging.LogFactory.getLog( SecurityUtil.class );
- private static boolean packageDefinitionEnabled =
+ private static final boolean packageDefinitionEnabled =
(System.getProperty("package.definition") == null &&
System.getProperty("package.access") == null) ? false : true;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
