[beam] branch master updated: [BEAM-6426] Use vendored guava class for kryo registration in Spark runner

[iemejia]

This is an automated email from the ASF dual-hosted git repository.

iemejia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 652166b  [BEAM-6426] Use vendored guava class for kryo registration in 
Spark runner
     new b8880ef  Merge pull request #7789: [BEAM-6426] Use vendored guava 
class for kryo registration in Spark runner
652166b is described below

commit 652166ba99d7a566fbc2ec59e9e7e2b18d63c80c
Author: Ismaël Mejía <ieme...@gmail.com>
AuthorDate: Fri Feb 8 17:28:52 2019 +0100

    [BEAM-6426] Use vendored guava class for kryo registration in Spark runner
---
 .../apache/beam/runners/spark/coders/BeamSparkRunnerRegistrator.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/runners/spark/src/main/java/org/apache/beam/runners/spark/coders/BeamSparkRunnerRegistrator.java
 
b/runners/spark/src/main/java/org/apache/beam/runners/spark/coders/BeamSparkRunnerRegistrator.java
index 9e64632..ebd395a 100644
--- 
a/runners/spark/src/main/java/org/apache/beam/runners/spark/coders/BeamSparkRunnerRegistrator.java
+++ 
b/runners/spark/src/main/java/org/apache/beam/runners/spark/coders/BeamSparkRunnerRegistrator.java
@@ -63,7 +63,9 @@ public class BeamSparkRunnerRegistrator implements 
KryoRegistrator {
     kryo.register(PaneInfo.class);
 
     try {
-      
kryo.register(Class.forName("com.google.common.collect.HashBasedTable$Factory"));
+      kryo.register(
+          Class.forName(
+              
"org.apache.beam.vendor.guava.v20_0.com.google.common.collect.HashBasedTable$Factory"));
       kryo.register(
           
Class.forName("org.apache.beam.sdk.util.WindowedValue$TimestampedValueInGlobalWindow"));
     } catch (ClassNotFoundException e) {