[flink] branch release-1.6 updated: [FLINK-10166] [table] Fix relocation of Base64 in AggregationCodeGenerator

[twalthr]

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

twalthr pushed a commit to branch release-1.6
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/release-1.6 by this push:
     new 2657868  [FLINK-10166] [table] Fix relocation of Base64 in 
AggregationCodeGenerator
2657868 is described below

commit 2657868eb704f148d5f3f1a24eaa07ad2243b189
Author: Timo Walther <twal...@apache.org>
AuthorDate: Wed Oct 31 10:30:23 2018 +0100

    [FLINK-10166] [table] Fix relocation of Base64 in AggregationCodeGenerator
---
 .../scala/org/apache/flink/table/codegen/AggregationCodeGenerator.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/AggregationCodeGenerator.scala
 
b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/AggregationCodeGenerator.scala
index 11c0008..483b5a4 100644
--- 
a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/AggregationCodeGenerator.scala
+++ 
b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/AggregationCodeGenerator.scala
@@ -330,7 +330,7 @@ class AggregationCodeGenerator(
         s"""
            |    $descClassQualifier $descFieldTerm = ($descClassQualifier)
            |      org.apache.flink.util.InstantiationUtil.deserializeObject(
-           |      
org.apache.commons.codec.binary.Base64.decodeBase64("$serializedData"),
+           |      
${classOf[Base64].getCanonicalName}.decodeBase64("$serializedData"),
            |      $contextTerm.getUserCodeClassLoader());
            |""".stripMargin
       val createDataView = if (dataViewField.getType == classOf[MapView[_, 
_]]) {