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 2015/06/11 10:27:10 UTC
logging-log4j2 git commit: [LOG4J2-1017] Update Java platform from
Java 6 to 7. Use try-with-resources.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 2d5c3d4ee -> 0c90563ff
[LOG4J2-1017] Update Java platform from Java 6 to 7. Use
try-with-resources.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0c90563f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0c90563f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0c90563f
Branch: refs/heads/master
Commit: 0c90563ff81381910bb6a36614d38d77d033d8e4
Parents: 2d5c3d4
Author: Gary Gregory <ga...@gmail.com>
Authored: Thu Jun 11 01:27:07 2015 -0700
Committer: Gary Gregory <ga...@gmail.com>
Committed: Thu Jun 11 01:27:07 2015 -0700
----------------------------------------------------------------------
.../plugins/util/PluginManagerPackagesTest.java | 27 ++++++++++----------
1 file changed, 14 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c90563f/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/PluginManagerPackagesTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/PluginManagerPackagesTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/PluginManagerPackagesTest.java
index 77e4b29..e1ccf74 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/PluginManagerPackagesTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/PluginManagerPackagesTest.java
@@ -93,22 +93,23 @@ public class PluginManagerPackagesTest {
// set up compiler
final JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
final DiagnosticCollector<JavaFileObject> diagnostics = new DiagnosticCollector<>();
- final StandardJavaFileManager fileManager = compiler.getStandardFileManager(diagnostics, null, null);
- final Iterable<? extends JavaFileObject> compilationUnits = fileManager.getJavaFileObjectsFromFiles(Arrays.asList(f));
-
- // compile generated source
- // (switch off annotation processing: no need to create Log4j2Plugins.dat)
- final List<String> options = Arrays.asList("-proc:none");
- compiler.getTask(null, fileManager, diagnostics, options, null, compilationUnits).call();
-
- // check we don't have any compilation errors
final List<String> errors = new ArrayList<>();
- for (final Diagnostic<? extends JavaFileObject> diagnostic : diagnostics.getDiagnostics()) {
- if (diagnostic.getKind() == Diagnostic.Kind.ERROR) {
- errors.add(String.format("Compile error: %s%n", diagnostic.getMessage(Locale.getDefault())));
+ try (final StandardJavaFileManager fileManager = compiler.getStandardFileManager(diagnostics, null, null)) {
+ final Iterable<? extends JavaFileObject> compilationUnits = fileManager.getJavaFileObjectsFromFiles(Arrays
+ .asList(f));
+
+ // compile generated source
+ // (switch off annotation processing: no need to create Log4j2Plugins.dat)
+ final List<String> options = Arrays.asList("-proc:none");
+ compiler.getTask(null, fileManager, diagnostics, options, null, compilationUnits).call();
+
+ // check we don't have any compilation errors
+ for (final Diagnostic<? extends JavaFileObject> diagnostic : diagnostics.getDiagnostics()) {
+ if (diagnostic.getKind() == Diagnostic.Kind.ERROR) {
+ errors.add(String.format("Compile error: %s%n", diagnostic.getMessage(Locale.getDefault())));
+ }
}
}
- fileManager.close();
assertTrue(errors.toString(), errors.isEmpty());
}
}