[flink] branch release-1.5 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.5
in repository https://gitbox.apache.org/repos/asf/flink.git


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

commit 78525bfb2b9524a6ba02ad0b1fe09a6b0a328bdd
Author: Timo Walther <twal...@apache.org>
AuthorDate: Wed Oct 31 10:41:10 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 a9ec112..2f6a785 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
@@ -253,7 +253,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[_, _]]) {