[1/4] flink git commit: [hotfix] Refactor to use multi-catch

[greg]

Repository: flink
Updated Branches:
  refs/heads/release-1.3 11a7f466e -> d0f89d9b2


[hotfix] Refactor to use multi-catch

This closes #3866


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/d0f89d9b
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/d0f89d9b
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/d0f89d9b

Branch: refs/heads/release-1.3
Commit: d0f89d9b219333a1f7d67d86ba90a9676cb6a50a
Parents: cfaecda
Author: Rodrigo Bonifacio 
Authored: Wed May 10 11:54:44 2017 -0300
Committer: Greg Hogan 
Committed: Thu May 11 12:44:14 2017 -0400

--
 .../java/org/apache/flink/api/java/io/AvroOutputFormat.java  | 4 +---
 .../flink/api/java/typeutils/runtime/PojoComparator.java | 4 +---
 .../runtime/iterative/concurrent/BlockingBackChannel.java| 4 +---
 .../flink/runtime/operators/hash/CompactingHashTable.java| 8 ++--
 .../org/apache/flink/runtime/operators/util/TaskConfig.java  | 4 +---
 5 files changed, 6 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/flink/blob/d0f89d9b/flink-connectors/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroOutputFormat.java
--
diff --git 
a/flink-connectors/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroOutputFormat.java
 
b/flink-connectors/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroOutputFormat.java
index 1db45a5..ae90362 100644
--- 
a/flink-connectors/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroOutputFormat.java
+++ 
b/flink-connectors/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroOutputFormat.java
@@ -125,9 +125,7 @@ public class AvroOutputFormat extends 
FileOutputFormat implements Serializ
datumWriter = new SpecificDatumWriter(avroValueType);
try {
schema = 
((org.apache.avro.specific.SpecificRecordBase)avroValueType.newInstance()).getSchema();
-   } catch (InstantiationException e) {
-   throw new RuntimeException(e.getMessage());
-   } catch (IllegalAccessException e) {
+   } catch (InstantiationException | 
IllegalAccessException e) {
throw new RuntimeException(e.getMessage());
}
} else {

http://git-wip-us.apache.org/repos/asf/flink/blob/d0f89d9b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java
--
diff --git 
a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java
 
b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java
index 945abc8..a3f4280 100644
--- 
a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java
+++ 
b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java
@@ -131,9 +131,7 @@ public final class PojoComparator extends 
CompositeTypeComparator implemen
try {
this.serializer = (TypeSerializer) 
InstantiationUtil.deserializeObject(

InstantiationUtil.serializeObject(toClone.serializer), 
Thread.currentThread().getContextClassLoader());
-   } catch (IOException e) {
-   throw new RuntimeException("Cannot copy serializer", e);
-   } catch (ClassNotFoundException e) {
+   } catch (IOException | ClassNotFoundException e) {
throw new RuntimeException("Cannot copy serializer", e);
}
}

http://git-wip-us.apache.org/repos/asf/flink/blob/d0f89d9b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannel.java
--
diff --git 
a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannel.java
 
b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannel.java
index 8631c99..067bbfe 100644
--- 
a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannel.java
+++ 
b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannel.java
@@ -51,9 +51,7 @@ public class BlockingBackChannel {
public DataInputView getReadEndAfterSuperstepEnded() {
try {
return queue.take().switchBuffers();
-   } catch (InterruptedException e) {
-   throw new RuntimeException(e);
-   } 

[1/4] flink git commit: [hotfix] Refactor to use multi-catch

[greg]

Repository: flink
Updated Branches:
  refs/heads/master fca8caea7 -> 704098725


[hotfix] Refactor to use multi-catch

This closes #3866


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/70409872
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/70409872
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/70409872

Branch: refs/heads/master
Commit: 7040987258de276ca446a7bcf8b92a2e9437cb17
Parents: 3ee8c69
Author: Rodrigo Bonifacio 
Authored: Wed May 10 11:54:44 2017 -0300
Committer: Greg Hogan 
Committed: Thu May 11 12:42:25 2017 -0400

--
 .../java/org/apache/flink/api/java/io/AvroOutputFormat.java  | 4 +---
 .../flink/api/java/typeutils/runtime/PojoComparator.java | 4 +---
 .../runtime/iterative/concurrent/BlockingBackChannel.java| 4 +---
 .../flink/runtime/operators/hash/CompactingHashTable.java| 8 ++--
 .../org/apache/flink/runtime/operators/util/TaskConfig.java  | 4 +---
 5 files changed, 6 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/flink/blob/70409872/flink-connectors/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroOutputFormat.java
--
diff --git 
a/flink-connectors/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroOutputFormat.java
 
b/flink-connectors/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroOutputFormat.java
index 1db45a5..ae90362 100644
--- 
a/flink-connectors/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroOutputFormat.java
+++ 
b/flink-connectors/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroOutputFormat.java
@@ -125,9 +125,7 @@ public class AvroOutputFormat extends 
FileOutputFormat implements Serializ
datumWriter = new SpecificDatumWriter(avroValueType);
try {
schema = 
((org.apache.avro.specific.SpecificRecordBase)avroValueType.newInstance()).getSchema();
-   } catch (InstantiationException e) {
-   throw new RuntimeException(e.getMessage());
-   } catch (IllegalAccessException e) {
+   } catch (InstantiationException | 
IllegalAccessException e) {
throw new RuntimeException(e.getMessage());
}
} else {

http://git-wip-us.apache.org/repos/asf/flink/blob/70409872/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java
--
diff --git 
a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java
 
b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java
index 945abc8..a3f4280 100644
--- 
a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java
+++ 
b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java
@@ -131,9 +131,7 @@ public final class PojoComparator extends 
CompositeTypeComparator implemen
try {
this.serializer = (TypeSerializer) 
InstantiationUtil.deserializeObject(

InstantiationUtil.serializeObject(toClone.serializer), 
Thread.currentThread().getContextClassLoader());
-   } catch (IOException e) {
-   throw new RuntimeException("Cannot copy serializer", e);
-   } catch (ClassNotFoundException e) {
+   } catch (IOException | ClassNotFoundException e) {
throw new RuntimeException("Cannot copy serializer", e);
}
}

http://git-wip-us.apache.org/repos/asf/flink/blob/70409872/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannel.java
--
diff --git 
a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannel.java
 
b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannel.java
index 8631c99..067bbfe 100644
--- 
a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannel.java
+++ 
b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannel.java
@@ -51,9 +51,7 @@ public class BlockingBackChannel {
public DataInputView getReadEndAfterSuperstepEnded() {
try {
return queue.take().switchBuffers();
-   } catch (InterruptedException e) {
-   throw new RuntimeException(e);
-   } catch