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:54:14 UTC
[1/2] groovy git commit: Minor refactoring and close writer
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X b7f56b769 -> 66bba437b
Minor refactoring and close writer
(cherry picked from commit 3edec28)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/ac6e37dc
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/ac6e37dc
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/ac6e37dc
Branch: refs/heads/GROOVY_2_6_X
Commit: ac6e37dcc24dacd50a9c953a63045a4e128b054d
Parents: b7f56b7
Author: sunlan <su...@apache.org>
Authored: Thu Dec 21 08:19:54 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Thu Dec 21 08:53: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/ac6e37dc/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);
}
}
}
[2/2] groovy git commit: Improve robust: Check type before casting
Posted by su...@apache.org.
Improve robust: Check type before casting
(cherry picked from commit 947aed9)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/66bba437
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/66bba437
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/66bba437
Branch: refs/heads/GROOVY_2_6_X
Commit: 66bba437b96fd305431ca93521b2d1faa0ad43e9
Parents: ac6e37d
Author: sunlan <su...@apache.org>
Authored: Thu Dec 21 08:22:37 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Thu Dec 21 08:53:58 2017 +0800
----------------------------------------------------------------------
src/main/java/org/codehaus/groovy/classgen/asm/MopWriter.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/66bba437/src/main/java/org/codehaus/groovy/classgen/asm/MopWriter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/MopWriter.java b/src/main/java/org/codehaus/groovy/classgen/asm/MopWriter.java
index 4f8f48c..0781108 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/MopWriter.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/MopWriter.java
@@ -69,6 +69,10 @@ public class MopWriter {
}
public boolean equals(Object obj) {
+ if (!(obj instanceof MopKey)) {
+ return false;
+ }
+
MopKey other = (MopKey) obj;
return other.name.equals(name) && equalParameterTypes(other.params,params);
}