Here I fix a potential NPE and contributed my patch, but no one reviewed after several months (https://github.com/apache/flink/pull/12702), this PR has conflicts, so I pull a new one ( https://github.com/apache/flink/pull/13836), would someone be nice to take a look at this?
Regards! Aron Tao
