You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2017/12/21 00:20:01 UTC
groovy git commit: Minor refactoring and close writer
Repository: groovy
Updated Branches:
refs/heads/master 15f8b021a -> 3edec28ff
Minor refactoring and close writer
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/3edec28f
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/3edec28f
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/3edec28f
Branch: refs/heads/master
Commit: 3edec28ff5f22c5cb938dc4fbeeb25f599d2c238
Parents: 15f8b02
Author: sunlan <su...@apache.org>
Authored: Thu Dec 21 08:19:54 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Thu Dec 21 08:19:54 2017 +0800
----------------------------------------------------------------------
src/main/groovy/groovy/ui/GroovyMain.java | 34 +++++++++-----------------
1 file changed, 11 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/3edec28f/src/main/groovy/groovy/ui/GroovyMain.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/ui/GroovyMain.java b/src/main/groovy/groovy/ui/GroovyMain.java
index a4d5986..24c1a9f 100644
--- a/src/main/groovy/groovy/ui/GroovyMain.java
+++ b/src/main/groovy/groovy/ui/GroovyMain.java
@@ -475,16 +475,11 @@ public class GroovyMain {
Script s = groovy.parse(getScriptSource(isScriptFile, script));
if (args.isEmpty()) {
- BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
- PrintWriter writer = new PrintWriter(System.out);
+ try(BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
+ PrintWriter writer = new PrintWriter(System.out)) {
- try {
processReader(s, reader, writer);
- } finally {
- reader.close();
- writer.close();
}
-
} else {
Iterator i = args.iterator();
while (i.hasNext()) {
@@ -508,13 +503,11 @@ public class GroovyMain {
throw new FileNotFoundException(file.getName());
if (!editFiles) {
- BufferedReader reader = new BufferedReader(new FileReader(file));
- try {
- PrintWriter writer = new PrintWriter(System.out);
+
+ try(BufferedReader reader = new BufferedReader(new FileReader(file));
+ PrintWriter writer = new PrintWriter(System.out)) {
+
processReader(s, reader, writer);
- writer.flush();
- } finally {
- reader.close();
}
} else {
File backup;
@@ -528,16 +521,11 @@ public class GroovyMain {
if (!file.renameTo(backup))
throw new IOException("unable to rename " + file + " to " + backup);
- BufferedReader reader = new BufferedReader(new FileReader(backup));
- try {
- PrintWriter writer = new PrintWriter(new FileWriter(file));
- try {
- processReader(s, reader, writer);
- } finally {
- writer.close();
- }
- } finally {
- reader.close();
+
+ try(BufferedReader reader = new BufferedReader(new FileReader(backup));
+ PrintWriter writer = new PrintWriter(new FileWriter(file))) {
+
+ processReader(s, reader, writer);
}
}
}