flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [4/5] incubator-flink git commit: [FLINK-1325] [Java API] Minor cleanups on the ClosureCleaner
Date Tue, 16 Dec 2014 21:24:08 GMT
[FLINK-1325] [Java API] Minor cleanups on the ClosureCleaner


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

Branch: refs/heads/master
Commit: cb607df8e5b181f2ae186a2bb9417f3b25b017ec
Parents: 486cc90
Author: Stephan Ewen <sewen@apache.org>
Authored: Tue Dec 16 21:06:59 2014 +0100
Committer: Stephan Ewen <sewen@apache.org>
Committed: Tue Dec 16 21:10:06 2014 +0100

----------------------------------------------------------------------
 .../java/org/apache/flink/api/common/ExecutionConfig.java     | 4 +++-
 flink-java/pom.xml                                            | 1 -
 .../main/java/org/apache/flink/api/java/ClosureCleaner.java   | 3 ---
 flink-scala/pom.xml                                           | 1 -
 pom.xml                                                       | 7 +++++++
 5 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/cb607df8/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java b/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java
index 3d110bd..03d5e3a 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java
@@ -21,10 +21,12 @@ package org.apache.flink.api.common;
 import java.io.Serializable;
 
 /**
- * A configuration config for configuring behaviour of the system, such as whether to use
+ * A configuration config for configuring behavior of the system, such as whether to use
  * the closure cleaner, object-reuse mode...
  */
 public class ExecutionConfig implements Serializable {
+	
+	private static final long serialVersionUID = 1L;
 
 	// Key for storing it in the Job Configuration
 	public static final String CONFIG_KEY = "runtime.config";

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/cb607df8/flink-java/pom.xml
----------------------------------------------------------------------
diff --git a/flink-java/pom.xml b/flink-java/pom.xml
index f3a251a..22826d8 100644
--- a/flink-java/pom.xml
+++ b/flink-java/pom.xml
@@ -56,7 +56,6 @@ under the License.
 		<dependency>
 			<groupId>org.ow2.asm</groupId>
 			<artifactId>asm</artifactId>
-			<version>4.0</version>
 		</dependency>
 		
 		<!--  guava needs to be in "provided" scope, to make sure it is not included into the
jars by the shading -->

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/cb607df8/flink-java/src/main/java/org/apache/flink/api/java/ClosureCleaner.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/ClosureCleaner.java b/flink-java/src/main/java/org/apache/flink/api/java/ClosureCleaner.java
index 7ff847b..d8d4074 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/ClosureCleaner.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/ClosureCleaner.java
@@ -46,14 +46,11 @@ public class ClosureCleaner {
 	public static void clean(Object func, boolean checkSerializable) {
 		Class<?> cls = func.getClass();
 
-		String this0Name = null;
-
 		// First find the field name of the "this$0" field, this can
 		// be "field$x" depending on the nesting
 		for (Field f: cls.getDeclaredFields()) {
 			if (f.getName().startsWith("this$")) {
 				// found our field:
-				this0Name = f.getName();
 				cleanThis0(func, cls, f.getName());
 			}
 		}

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/cb607df8/flink-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml
index d67afc8..ae16876 100644
--- a/flink-scala/pom.xml
+++ b/flink-scala/pom.xml
@@ -78,7 +78,6 @@ under the License.
 		<dependency>
 			<groupId>org.ow2.asm</groupId>
 			<artifactId>asm</artifactId>
-			<version>4.0</version>
 		</dependency>
 		
 		<!--  guava needs to be in "provided" scope, to make sure it is not included into the
jars by the shading -->

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/cb607df8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8e988e7..267d99e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,6 +153,13 @@ under the License.
 	<!-- this section defines the module versions that are used if nothing else is specified.
-->
 	<dependencyManagement>
 		<dependencies>
+		
+			<!-- ASM is used by us, Kryo, Hadoop, ... -->
+			<dependency>
+				<groupId>org.ow2.asm</groupId>
+				<artifactId>asm</artifactId>
+				<version>4.0</version>
+			</dependency>
 
 			<!-- Make sure we use a consistent jetty version throughout the project -->
 			<dependency>


Mime
View raw message