You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2014/06/25 06:25:54 UTC
svn commit: r1605256 - in /logging/log4j/log4j2/trunk/log4j-api/src:
main/java/org/apache/logging/log4j/ main/java/org/apache/logging/log4j/spi/
main/java/org/apache/logging/log4j/status/
main/java/org/apache/logging/log4j/util/ test/java/org/apache/lo...
Author: ggregory
Date: Wed Jun 25 04:25:54 2014
New Revision: 1605256
URL: http://svn.apache.org/r1605256
Log:
Use final.
Modified:
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/Level.java
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/ThreadContext.java
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/MutableThreadContextStack.java
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/StandardLevel.java
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/MarkerTest.java
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/osgi/BundleTestInfo.java
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/osgi/OsgiRule.java
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextMapTest.java
Modified: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/Level.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/Level.java?rev=1605256&r1=1605255&r2=1605256&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/Level.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/Level.java Wed Jun 25 04:25:54 2014
@@ -165,12 +165,12 @@ public final class Level implements Comp
}
@Override
- public int compareTo(Level other) {
+ public int compareTo(final Level other) {
return intLevel < other.intLevel ? -1 : (intLevel > other.intLevel ? 1 : 0);
}
@Override
- public boolean equals(Object other) {
+ public boolean equals(final Object other) {
return other instanceof Level && other == this;
}
@@ -205,13 +205,13 @@ public final class Level implements Comp
* @throws java.lang.IllegalArgumentException if the name is null or intValue is less than zero.
*/
public static Level forName(final String name, final int intValue) {
- Level level = levels.get(name);
+ final Level level = levels.get(name);
if (level != null) {
return level;
}
try {
return new Level(name, intValue);
- } catch (IllegalStateException ex) {
+ } catch (final IllegalStateException ex) {
// The level was added by something else so just return that one.
return levels.get(name);
}
@@ -250,7 +250,7 @@ public final class Level implements Comp
if (name == null) {
return defaultLevel;
}
- Level level = levels.get(name.toUpperCase(Locale.ENGLISH));
+ final Level level = levels.get(name.toUpperCase(Locale.ENGLISH));
return level == null ? defaultLevel : level;
}
@@ -259,7 +259,7 @@ public final class Level implements Comp
* @return An array of Levels.
*/
public static Level[] values() {
- Collection<Level> values = Level.levels.values();
+ final Collection<Level> values = Level.levels.values();
return values.toArray(new Level[values.size()]);
}
Modified: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java?rev=1605256&r1=1605255&r2=1605256&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java Wed Jun 25 04:25:54 2014
@@ -141,7 +141,7 @@ public final class MarkerManager {
int count = 0;
int size = parents.length;
if (localParents != null) {
- for (Marker parent : parents) {
+ for (final Marker parent : parents) {
if (!(contains(parent, localParents) || parent.isInstanceOf(this))) {
++count;
}
@@ -158,7 +158,7 @@ public final class MarkerManager {
System.arraycopy(localParents, 0, markers, 0, localParents.length);
}
int index = localParents == null ? 0 : localParents.length;
- for (Marker parent : parents) {
+ for (final Marker parent : parents) {
if (localParents == null || !(contains(parent, localParents) || parent.isInstanceOf(this))) {
markers[index++] = parent;
}
Modified: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/ThreadContext.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/ThreadContext.java?rev=1605256&r1=1605255&r2=1605256&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/ThreadContext.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/ThreadContext.java Wed Jun 25 04:25:54 2014
@@ -66,7 +66,7 @@ public final class ThreadContext {
}
@Override
- public void push(String message) {
+ public void push(final String message) {
throw new UnsupportedOperationException();
}
@@ -81,12 +81,12 @@ public final class ThreadContext {
}
@Override
- public void trim(int depth) {
+ public void trim(final int depth) {
// Do nothing
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
// Similar to java.util.Collections.EmptyList.equals(Object)
return (o instanceof Collection) && ((Collection<?>) o).isEmpty();
}
@@ -103,32 +103,32 @@ public final class ThreadContext {
}
@Override
- public <T> T[] toArray(T[] a) {
+ public <T> T[] toArray(final T[] a) {
throw new UnsupportedOperationException();
}
@Override
- public boolean add(String e) {
+ public boolean add(final String e) {
throw new UnsupportedOperationException();
}
@Override
- public boolean containsAll(Collection<?> c) {
+ public boolean containsAll(final Collection<?> c) {
return false;
}
@Override
- public boolean addAll(Collection<? extends String> c) {
+ public boolean addAll(final Collection<? extends String> c) {
throw new UnsupportedOperationException();
}
@Override
- public boolean removeAll(Collection<?> c) {
+ public boolean removeAll(final Collection<?> c) {
throw new UnsupportedOperationException();
}
@Override
- public boolean retainAll(Collection<?> c) {
+ public boolean retainAll(final Collection<?> c) {
throw new UnsupportedOperationException();
}
Modified: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java?rev=1605256&r1=1605255&r2=1605256&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java Wed Jun 25 04:25:54 2014
@@ -1356,9 +1356,9 @@ public abstract class AbstractLogger imp
* @param params Arguments specified by the format.
*/
@Override
- public void printf(Level level, Marker marker, String format, Object... params) {
+ public void printf(final Level level, final Marker marker, final String format, final Object... params) {
if (isEnabled(level, marker, format, params)) {
- Message msg = new StringFormattedMessage(format, params);
+ final Message msg = new StringFormattedMessage(format, params);
logMessage(FQCN, level, marker, msg, msg.getThrowable());
}
}
@@ -1371,9 +1371,9 @@ public abstract class AbstractLogger imp
* @param params Arguments specified by the format.
*/
@Override
- public void printf(Level level, String format, Object... params) {
+ public void printf(final Level level, final String format, final Object... params) {
if (isEnabled(level, null, format, params)) {
- Message msg = new StringFormattedMessage(format, params);
+ final Message msg = new StringFormattedMessage(format, params);
logMessage(FQCN, level, null, msg, msg.getThrowable());
}
}
Modified: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java?rev=1605256&r1=1605255&r2=1605256&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java Wed Jun 25 04:25:54 2014
@@ -161,7 +161,7 @@ public class DefaultThreadContextMap imp
@Override
public String toString() {
- Map<String, String> map = localMap.get();
+ final Map<String, String> map = localMap.get();
return map == null ? "{}" : map.toString();
}
@@ -169,14 +169,14 @@ public class DefaultThreadContextMap imp
public int hashCode() {
final int prime = 31;
int result = 1;
- Map<String, String> map = this.localMap.get();
+ final Map<String, String> map = this.localMap.get();
result = prime * result + ((map == null) ? 0 : map.hashCode());
result = prime * result + (this.useMap ? 1231 : 1237);
return result;
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
@@ -184,7 +184,7 @@ public class DefaultThreadContextMap imp
return false;
}
if (obj instanceof DefaultThreadContextMap) {
- DefaultThreadContextMap other = (DefaultThreadContextMap) obj;
+ final DefaultThreadContextMap other = (DefaultThreadContextMap) obj;
if (this.useMap != other.useMap) {
return false;
}
@@ -192,9 +192,9 @@ public class DefaultThreadContextMap imp
if (!(obj instanceof ThreadContextMap)) {
return false;
}
- ThreadContextMap other = (ThreadContextMap) obj;
- Map<String, String> map = this.localMap.get();
- Map<String, String> otherMap = other.getImmutableMapOrNull();
+ final ThreadContextMap other = (ThreadContextMap) obj;
+ final Map<String, String> map = this.localMap.get();
+ final Map<String, String> otherMap = other.getImmutableMapOrNull();
if (map == null) {
if (otherMap != null) {
return false;
Modified: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java?rev=1605256&r1=1605255&r2=1605256&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java Wed Jun 25 04:25:54 2014
@@ -105,7 +105,7 @@ public class DefaultThreadContextStack i
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
@@ -113,7 +113,7 @@ public class DefaultThreadContextStack i
return false;
}
if (obj instanceof DefaultThreadContextStack) {
- DefaultThreadContextStack other = (DefaultThreadContextStack) obj;
+ final DefaultThreadContextStack other = (DefaultThreadContextStack) obj;
if (this.useStack != other.useStack) {
return false;
}
@@ -121,7 +121,7 @@ public class DefaultThreadContextStack i
if (!(obj instanceof ThreadContextStack)) {
return false;
}
- ThreadContextStack other = (ThreadContextStack) obj;
+ final ThreadContextStack other = (ThreadContextStack) obj;
final List<String> otherAsList = other.asList();
final List<String> list = stack.get();
if (list == null) {
Modified: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/MutableThreadContextStack.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/MutableThreadContextStack.java?rev=1605256&r1=1605255&r2=1605256&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/MutableThreadContextStack.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/MutableThreadContextStack.java Wed Jun 25 04:25:54 2014
@@ -176,7 +176,7 @@ public class MutableThreadContextStack i
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
@@ -186,7 +186,7 @@ public class MutableThreadContextStack i
if (!(obj instanceof ThreadContextStack)) {
return false;
}
- ThreadContextStack other = (ThreadContextStack) obj;
+ final ThreadContextStack other = (ThreadContextStack) obj;
final List<String> otherAsList = other.asList();
if (this.list == null) {
if (otherAsList != null) {
Modified: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/StandardLevel.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/StandardLevel.java?rev=1605256&r1=1605255&r2=1605256&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/StandardLevel.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/StandardLevel.java Wed Jun 25 04:25:54 2014
@@ -86,9 +86,9 @@ public enum StandardLevel {
* @param intLevel The integer value of the Level.
* @return The StandardLevel.
*/
- public static StandardLevel getStandardLevel(int intLevel) {
+ public static StandardLevel getStandardLevel(final int intLevel) {
StandardLevel level = StandardLevel.OFF;
- for (StandardLevel lvl : levelSet) {
+ for (final StandardLevel lvl : levelSet) {
if (lvl.intLevel() > intLevel) {
break;
}
Modified: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java?rev=1605256&r1=1605255&r2=1605256&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java Wed Jun 25 04:25:54 2014
@@ -96,7 +96,7 @@ public final class StatusLogger extends
listenersLock.writeLock().lock();
try {
listeners.add(listener);
- Level lvl = listener.getStatusLevel();
+ final Level lvl = listener.getStatusLevel();
if (listenersLevel < lvl.intLevel()) {
listenersLevel = lvl.intLevel();
}
@@ -115,8 +115,8 @@ public final class StatusLogger extends
try {
listeners.remove(listener);
int lowest = Level.toLevel(DEFAULT_STATUS_LEVEL, Level.WARN).intLevel();
- for (StatusListener l : listeners) {
- int level = l.getStatusLevel().intLevel();
+ for (final StatusListener l : listeners) {
+ final int level = l.getStatusLevel().intLevel();
if (lowest < level) {
lowest = level;
}
Modified: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java?rev=1605256&r1=1605255&r2=1605256&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java Wed Jun 25 04:25:54 2014
@@ -54,8 +54,8 @@ public final class PropertiesUtil {
* or a URL.
* @return a new Properties object
*/
- static Properties loadClose(InputStream in, Object source) {
- Properties props = new Properties();
+ static Properties loadClose(final InputStream in, final Object source) {
+ final Properties props = new Properties();
if (null != in) {
try {
props.load(in);
@@ -75,27 +75,28 @@ public final class PropertiesUtil {
public PropertiesUtil(final String propsLocn) {
final ClassLoader loader = ProviderUtil.findClassLoader();
@SuppressWarnings("IOResourceOpenedButNotSafelyClosed")
+ final
Properties properties = new Properties();
try {
- Enumeration<URL> enumeration = loader.getResources(propsLocn);
+ final Enumeration<URL> enumeration = loader.getResources(propsLocn);
while (enumeration.hasMoreElements()) {
final URL url = enumeration.nextElement();
final InputStream in = url.openStream();
try {
properties.load(in);
- } catch (IOException ioe) {
+ } catch (final IOException ioe) {
LOGGER.error("Unable to read {}", url.toString());
} finally {
try {
in.close();
- } catch (IOException ioe) {
+ } catch (final IOException ioe) {
LOGGER.error("Unable to close {}", url.toString(), ioe);
}
}
}
- } catch (IOException ioe) {
+ } catch (final IOException ioe) {
LOGGER.error("Unable to access {}", propsLocn, ioe);
}
this.props = properties;
Modified: logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/MarkerTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/MarkerTest.java?rev=1605256&r1=1605255&r2=1605256&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/MarkerTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/MarkerTest.java Wed Jun 25 04:25:54 2014
@@ -33,13 +33,13 @@ public class MarkerTest {
@Test
public void testGetMarker() {
- Marker expected = MarkerManager.getMarker("A");
+ final Marker expected = MarkerManager.getMarker("A");
assertNull(expected.getParents());
}
@Test
public void testGetMarkerWithParents() {
- Marker expected = MarkerManager.getMarker("A");
+ final Marker expected = MarkerManager.getMarker("A");
final Marker p1 = MarkerManager.getMarker("P1");
p1.addParents(MarkerManager.getMarker("PP1"));
final Marker p2 = MarkerManager.getMarker("P2");
@@ -86,7 +86,7 @@ public class MarkerTest {
final Marker existing = MarkerManager.getMarker("EXISTING");
final Marker test1 = MarkerManager.getMarker("TEST1").setParents(existing);
test1.addParents(parent);
- Marker[] parents = test1.getParents();
+ final Marker[] parents = test1.getParents();
test1.addParents(existing);
assertTrue("duplicate add allowed", parents.length == test1.getParents().length);
test1.addParents(existing, MarkerManager.getMarker("EXTRA"));
Modified: logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/osgi/BundleTestInfo.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/osgi/BundleTestInfo.java?rev=1605256&r1=1605255&r2=1605256&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/osgi/BundleTestInfo.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/osgi/BundleTestInfo.java Wed Jun 25 04:25:54 2014
@@ -37,27 +37,27 @@ public class BundleTestInfo {
*/
public BundleTestInfo() {
// get a raw POM view, not a fully realized POM object.
- MavenXpp3Reader reader = new MavenXpp3Reader();
+ final MavenXpp3Reader reader = new MavenXpp3Reader();
FileReader fileReader;
final String fileName = "pom.xml";
try {
fileReader = new FileReader(fileName);
- } catch (FileNotFoundException e) {
+ } catch (final FileNotFoundException e) {
throw new IllegalStateException("Could not find " + fileName, e);
}
try {
- Model model = reader.read(fileReader);
+ final Model model = reader.read(fileReader);
this.project = new MavenProject(model);
- } catch (FileNotFoundException e) {
+ } catch (final FileNotFoundException e) {
throw new IllegalStateException(e);
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new IllegalStateException(e);
- } catch (XmlPullParserException e) {
+ } catch (final XmlPullParserException e) {
throw new IllegalStateException(e);
} finally {
try {
fileReader.close();
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new IllegalStateException(e);
}
}
Modified: logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/osgi/OsgiRule.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/osgi/OsgiRule.java?rev=1605256&r1=1605255&r2=1605256&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/osgi/OsgiRule.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/osgi/OsgiRule.java Wed Jun 25 04:25:54 2014
@@ -59,7 +59,7 @@ public class OsgiRule extends ExternalRe
if (framework != null) {
try {
framework.stop();
- } catch (BundleException e) {
+ } catch (final BundleException e) {
throw new RuntimeException(e);
} finally {
framework = null;
Modified: logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextMapTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextMapTest.java?rev=1605256&r1=1605255&r2=1605256&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextMapTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextMapTest.java Wed Jun 25 04:25:54 2014
@@ -194,7 +194,7 @@ public class DefaultThreadContextMapTest
@Test
public void testThreadLocalNotInheritableByDefault() {
System.clearProperty(DefaultThreadContextMap.INHERITABLE_MAP);
- ThreadLocal<Map<String, String>> threadLocal = DefaultThreadContextMap.createThreadLocalMap(true);
+ final ThreadLocal<Map<String, String>> threadLocal = DefaultThreadContextMap.createThreadLocalMap(true);
assertFalse(threadLocal instanceof InheritableThreadLocal<?>);
}
@@ -202,7 +202,7 @@ public class DefaultThreadContextMapTest
public void testThreadLocalInheritableIfConfigured() {
System.setProperty(DefaultThreadContextMap.INHERITABLE_MAP, "true");
try {
- ThreadLocal<Map<String, String>> threadLocal = DefaultThreadContextMap.createThreadLocalMap(true);
+ final ThreadLocal<Map<String, String>> threadLocal = DefaultThreadContextMap.createThreadLocalMap(true);
assertTrue(threadLocal instanceof InheritableThreadLocal<?>);
} finally {
System.clearProperty(DefaultThreadContextMap.INHERITABLE_MAP);