flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [1/4] flink git commit: [FLINK-2509] [hotfix] Address pull request comments for ClassLoaderUtils
Date Fri, 14 Aug 2015 11:26:09 GMT
Repository: flink
Updated Branches:
  refs/heads/master 26c6447e9 -> 51872d73b


[FLINK-2509] [hotfix] Address pull request comments for ClassLoaderUtils

Correcting commit, because the wrong commit was pushed earlier.


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

Branch: refs/heads/master
Commit: 4cc8d66fbf7d288581d1912527f54c3d0f1943d7
Parents: 26c6447
Author: Stephan Ewen <sewen@apache.org>
Authored: Thu Aug 13 17:00:18 2015 +0200
Committer: Stephan Ewen <sewen@apache.org>
Committed: Fri Aug 14 12:19:29 2015 +0200

----------------------------------------------------------------------
 .../java/org/apache/flink/runtime/util/ClassLoaderUtilsTest.java | 3 ---
 .../java/org/apache/flink/streaming/api/graph/StreamConfig.java  | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/4cc8d66f/flink-runtime/src/test/java/org/apache/flink/runtime/util/ClassLoaderUtilsTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/util/ClassLoaderUtilsTest.java
b/flink-runtime/src/test/java/org/apache/flink/runtime/util/ClassLoaderUtilsTest.java
index d5f3c9e..654001d 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/util/ClassLoaderUtilsTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/util/ClassLoaderUtilsTest.java
@@ -85,8 +85,6 @@ public class ClassLoaderUtilsTest {
 			assertTrue(info.indexOf(validJar.getAbsolutePath() + "' (valid") > 0);
 			assertTrue(info.indexOf(invalidJar.getAbsolutePath() + "' (invalid JAR") > 0);
 			assertTrue(info.indexOf(nonExisting.getAbsolutePath() + "' (missing") > 0);
-
-			System.out.println(info);
 		}
 		catch (Exception e) {
 			e.printStackTrace();
@@ -107,7 +105,6 @@ public class ClassLoaderUtilsTest {
 	@Test
 	public void testWithAppClassLoader() {
 		try {
-			// must return something when invoked with 'null'
 			String result = ClassLoaderUtil.getUserCodeClassLoaderInfo(ClassLoader.getSystemClassLoader());
 			assertTrue(result.toLowerCase().contains("system classloader"));
 		}

http://git-wip-us.apache.org/repos/asf/flink/blob/4cc8d66f/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/graph/StreamConfig.java
----------------------------------------------------------------------
diff --git a/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/graph/StreamConfig.java
b/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/graph/StreamConfig.java
index a8486d3..4f19db6 100644
--- a/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/graph/StreamConfig.java
+++ b/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/graph/StreamConfig.java
@@ -213,8 +213,8 @@ public class StreamConfig implements Serializable {
 			String exceptionMessage = "Cannot load user class: " + e.getMessage()
 					+ "\nClassLoader info: " + classLoaderInfo + 
 					(loadableDoubleCheck ? 
-							"Class was actually found in classloader - deserialization issue." :
-							"Class not resolveable through given classloader.");
+							"\nClass was actually found in classloader - deserialization issue." :
+							"\nClass not resolvable through given classloader.");
 			
 			throw new StreamTaskException(exceptionMessage);
 		}


Mime
View raw message