Author: sebb Date: Fri Jan 22 00:16:52 2010 New Revision: 901937 URL: http://svn.apache.org/viewvc?rev=901937&view=rev Log: Make some fields final
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/NameUpdater.java jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/NameUpdater.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/NameUpdater.java?rev=901937&r1=901936&r2=901937&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/NameUpdater.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/NameUpdater.java Fri Jan 22 00:16:52 2010 @@ -32,8 +32,9 @@ import org.apache.log.Logger; public final class NameUpdater { - private static Properties nameMap; - + private static final Properties nameMap; + // Read-only access after class has been initialised + private static final Logger log = LoggingManager.getLoggerForClass(); static { Modified: jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java?rev=901937&r1=901936&r2=901937&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java (original) +++ jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java Fri Jan 22 00:16:52 2010 @@ -28,8 +28,9 @@ */ public class ObjectFactory { - //@GuardedBy("this") - private static ObjectFactory FACTORY = null; + private static class ObjectFactoryHolder { + static final ObjectFactory FACTORY = new ObjectFactory(); + } private final Parser PARSER; @@ -41,14 +42,11 @@ PARSER = new MonitorParser(this); } - public static synchronized ObjectFactory getInstance() { - if (FACTORY == null) { - FACTORY = new ObjectFactory(); - } - return FACTORY; + public static ObjectFactory getInstance() { + return ObjectFactoryHolder.FACTORY; } - public synchronized Status parseBytes(byte[] bytes) { + public Status parseBytes(byte[] bytes) { return PARSER.parseBytes(bytes); } Modified: jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java?rev=901937&r1=901936&r2=901937&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java (original) +++ jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java Fri Jan 22 00:16:52 2010 @@ -51,7 +51,7 @@ /** * Map containing the initialization parameters for the JavaSamplerClient. */ - private Map<String, String> params = null; + private final Map<String, String> params; /** * Create a new JavaSampler with the specified initialization parameters. --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org