Browse Source

Synchronized fields ought to be final

master
Gintas Grigelionis 7 years ago
parent
commit
bc5836f688
4 changed files with 6 additions and 6 deletions
  1. +1
    -1
      src/main/org/apache/tools/ant/ComponentHelper.java
  2. +3
    -3
      src/main/org/apache/tools/ant/PropertyHelper.java
  3. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
  4. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/ProcessDestroyer.java

+ 1
- 1
src/main/org/apache/tools/ant/ComponentHelper.java View File

@@ -60,7 +60,7 @@ import org.apache.tools.ant.util.FileUtils;
*/ */
public class ComponentHelper { public class ComponentHelper {
/** Map of component name to lists of restricted definitions */ /** Map of component name to lists of restricted definitions */
private Map<String, List<AntTypeDefinition>> restrictedDefinitions = new HashMap<>();
private final Map<String, List<AntTypeDefinition>> restrictedDefinitions = new HashMap<>();


/** Map from component name to anttypedefinition */ /** Map from component name to anttypedefinition */
private final Hashtable<String, AntTypeDefinition> antTypeTable = new Hashtable<>(); private final Hashtable<String, AntTypeDefinition> antTypeTable = new Hashtable<>();


+ 3
- 3
src/main/org/apache/tools/ant/PropertyHelper.java View File

@@ -238,21 +238,21 @@ public class PropertyHelper implements GetProperty {
private final Hashtable<Class<? extends Delegate>, List<Delegate>> delegates = new Hashtable<>(); private final Hashtable<Class<? extends Delegate>, List<Delegate>> delegates = new Hashtable<>();


/** Project properties map (usually String to String). */ /** Project properties map (usually String to String). */
private Hashtable<String, Object> properties = new Hashtable<>();
private final Hashtable<String, Object> properties = new Hashtable<>();


/** /**
* Map of "user" properties (as created in the Ant task, for example). * Map of "user" properties (as created in the Ant task, for example).
* Note that these key/value pairs are also always put into the * Note that these key/value pairs are also always put into the
* project properties, so only the project properties need to be queried. * project properties, so only the project properties need to be queried.
*/ */
private Hashtable<String, Object> userProperties = new Hashtable<>();
private final Hashtable<String, Object> userProperties = new Hashtable<>();


/** /**
* Map of inherited "user" properties - that are those "user" * Map of inherited "user" properties - that are those "user"
* properties that have been created by tasks and not been set * properties that have been created by tasks and not been set
* from the command line or a GUI tool. * from the command line or a GUI tool.
*/ */
private Hashtable<String, Object> inheritedProperties = new Hashtable<>();
private final Hashtable<String, Object> inheritedProperties = new Hashtable<>();


/** /**
* Default constructor. * Default constructor.


+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/JDBCTask.java View File

@@ -97,7 +97,7 @@ public abstract class JDBCTask extends Task {
* getting an OutOfMemoryError when calling this task * getting an OutOfMemoryError when calling this task
* multiple times in a row. * multiple times in a row.
*/ */
private static Hashtable<String, AntClassLoader> LOADER_MAP = new Hashtable<>(HASH_TABLE_SIZE);
private static final Hashtable<String, AntClassLoader> LOADER_MAP = new Hashtable<>(HASH_TABLE_SIZE);


private boolean caching = true; private boolean caching = true;




+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/ProcessDestroyer.java View File

@@ -31,7 +31,7 @@ import java.util.Set;
class ProcessDestroyer implements Runnable { class ProcessDestroyer implements Runnable {
private static final int THREAD_DIE_TIMEOUT = 20000; private static final int THREAD_DIE_TIMEOUT = 20000;


private Set<Process> processes = new HashSet<>();
private final Set<Process> processes = new HashSet<>();
// methods to register and unregister shutdown hooks // methods to register and unregister shutdown hooks
private Method addShutdownHookMethod; private Method addShutdownHookMethod;
private Method removeShutdownHookMethod; private Method removeShutdownHookMethod;


Loading…
Cancel
Save