Better lvarnames. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/acbecc0b Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/acbecc0b Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/acbecc0b
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure Commit: acbecc0bd14474a63ef09abb4e301048f9b6518f Parents: 1db38fc Author: Gary Gregory <ggreg...@apache.org> Authored: Thu Aug 25 13:58:11 2016 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Thu Aug 25 13:58:11 2016 -0700 ---------------------------------------------------------------------- .../log4j/core/config/plugins/util/ResolverUtilTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/acbecc0b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java index 92e6ee9..f5d13eb 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java @@ -168,10 +168,10 @@ public class ResolverUtilTest { static URLClassLoader compileJarAndCreateClassLoader(String suffix) throws IOException, Exception { File workDir = compile(suffix); File jarFile = new File(workDir, "customplugin" + suffix + ".jar"); - URI jarURL = jarFile.toURI(); - createJar(jarURL, workDir, new File(workDir, + URI jarURI = jarFile.toURI(); + createJar(jarURI, workDir, new File(workDir, "customplugin" + suffix + "/FixedString" + suffix + "Layout.class")); - return URLClassLoader.newInstance(new URL[] {jarURL.toURL()}); + return URLClassLoader.newInstance(new URL[] {jarURI.toURL()}); } static URLClassLoader compileAndCreateClassLoader(String suffix) throws IOException { @@ -197,10 +197,10 @@ public class ResolverUtilTest { return workDir; } - static void createJar(URI jarURL, File workDir, File f) throws Exception { + static void createJar(URI jarURI, File workDir, File f) throws Exception { Map<String, String> env = new HashMap<>(); env.put("create", "true"); - URI uri = URI.create("jar:file://" + jarURL.getPath()); + URI uri = URI.create("jar:file://" + jarURI.getPath()); try (FileSystem zipfs = FileSystems.newFileSystem(uri, env)) { Path path = zipfs.getPath(workDir.toPath().relativize(f.toPath()).toString()); if (path.getParent() != null) {
