Repository: spark Updated Branches: refs/heads/branch-2.1 772a9b969 -> 0b25a7d93
[SPARK-20922][CORE][HOTFIX] Don't use Java 8 lambdas in older branches. Author: Marcelo Vanzin <[email protected]> Closes #18178 from vanzin/SPARK-20922-hotfix. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/0b25a7d9 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0b25a7d9 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0b25a7d9 Branch: refs/heads/branch-2.1 Commit: 0b25a7d93359e348e11b2e8698990a53436b3c5d Parents: 772a9b9 Author: Marcelo Vanzin <[email protected]> Authored: Thu Jun 1 16:45:31 2017 -0700 Committer: Marcelo Vanzin <[email protected]> Committed: Thu Jun 1 16:45:31 2017 -0700 ---------------------------------------------------------------------- .../org/apache/spark/launcher/FilteredObjectInputStream.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/0b25a7d9/launcher/src/main/java/org/apache/spark/launcher/FilteredObjectInputStream.java ---------------------------------------------------------------------- diff --git a/launcher/src/main/java/org/apache/spark/launcher/FilteredObjectInputStream.java b/launcher/src/main/java/org/apache/spark/launcher/FilteredObjectInputStream.java index 4d254a0..46796b1 100644 --- a/launcher/src/main/java/org/apache/spark/launcher/FilteredObjectInputStream.java +++ b/launcher/src/main/java/org/apache/spark/launcher/FilteredObjectInputStream.java @@ -42,7 +42,13 @@ class FilteredObjectInputStream extends ObjectInputStream { protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException { - boolean isValid = ALLOWED_PACKAGES.stream().anyMatch(p -> desc.getName().startsWith(p)); + boolean isValid = false; + for (String p : ALLOWED_PACKAGES) { + if (desc.getName().startsWith(p)) { + isValid = true; + break; + } + } if (!isValid) { throw new IllegalArgumentException( String.format("Unexpected class in stream: %s", desc.getName())); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
