[oozie] branch master updated: OOZIE-2693 SimpleHCatDependencyCache.removeMissingDependency can throw NPE (puru via asalamon74)

[as...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new d177604  OOZIE-2693 SimpleHCatDependencyCache.removeMissingDependency can throw NPE (puru via asalamon74)
d177604 is described below

commit d17760471f42d6a49e98df1e97bd2f1810465030
Author: Andras Salamon <as...@apache.org>
AuthorDate: Tue Mar 5 14:30:59 2019 +0100

    OOZIE-2693 SimpleHCatDependencyCache.removeMissingDependency can throw NPE (puru via asalamon74)
---
 .../org/apache/oozie/dependency/hcat/SimpleHCatDependencyCache.java     | 2 +-
 release-log.txt                                                         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/apache/oozie/dependency/hcat/SimpleHCatDependencyCache.java b/core/src/main/java/org/apache/oozie/dependency/hcat/SimpleHCatDependencyCache.java
index 1b2bd24..2bfe0cf 100644
--- a/core/src/main/java/org/apache/oozie/dependency/hcat/SimpleHCatDependencyCache.java
+++ b/core/src/main/java/org/apache/oozie/dependency/hcat/SimpleHCatDependencyCache.java
@@ -147,7 +147,7 @@ public class SimpleHCatDependencyCache implements HCatDependencyCache {
                 if (partKeys != null) {
                     partKeys.remove(partKey);
                 }
-                if (partKeys.size() == 0) {
+                if (partKeys != null && partKeys.size() == 0) {
                     partitionMap.remove(tableKey);
                 }
                 if (partitionMap.size() == 0) {
diff --git a/release-log.txt b/release-log.txt
index 10f64a6..cc8bffc 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.2.0 release (trunk - unreleased)
 
+OOZIE-2693 SimpleHCatDependencyCache.removeMissingDependency can throw NPE (puru via asalamon74)
 OOZIE-3442 Check and eliminate builds/runHudsonCIBuild.sh (nobigo via asalamon74)
 OOZIE-1702 [build] Fix Javadoc warnings (dionusos via kmarton)
 OOZIE-3395 amend [build] Migration from FindBugs to SpotBugs (kmarton via asalamon74)