Add null pointer check for ProjectManager#getProject to avoid NPE
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/ca42b92b Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/ca42b92b Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/ca42b92b Branch: refs/heads/master Commit: ca42b92b6d86eb6cb3eb22a212e77f2155b19890 Parents: f37fbce Author: nichunen <chunen...@kyligence.io> Authored: Thu Dec 21 11:42:43 2017 +0800 Committer: Li Yang <liy...@apache.org> Committed: Wed Dec 20 21:45:01 2017 -0600 ---------------------------------------------------------------------- .../java/org/apache/kylin/metadata/project/ProjectManager.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/ca42b92b/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectManager.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectManager.java b/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectManager.java index 1c0254e..0dd364d 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectManager.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectManager.java @@ -132,6 +132,10 @@ public class ProjectManager { } public ProjectInstance getProject(String projectName) { + // Null check is needed for ConcurrentMap does not supporting .get(null) + if (projectName == null) + return null; + try (AutoLock lock = prjMapLock.lockForRead()) { return projectMap.get(projectName); }
