Repository: incubator-eagle
Updated Branches:
  refs/heads/master a34ef878a -> 73642a4ee


[EAGLE-844] Fix a potential NPE

https://issues.apache.org/jira/browse/EAGLE-844

Author: lifove <j...@lifove.net>
Author: JC <j...@lifove.net>

Closes #751 from lifove/master.


Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/73642a4e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/73642a4e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/73642a4e

Branch: refs/heads/master
Commit: 73642a4ee2e307a572457bca664b790385038c81
Parents: a34ef87
Author: lifove <j...@lifove.net>
Authored: Tue Dec 20 19:16:25 2016 +0800
Committer: wujinhu <wujinhu...@126.com>
Committed: Tue Dec 20 19:16:25 2016 +0800

----------------------------------------------------------------------
 .../org/apache/eagle/storage/hbase/HBaseEntitySchemaManager.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/73642a4e/eagle-core/eagle-query/eagle-storage-hbase/src/main/java/org/apache/eagle/storage/hbase/HBaseEntitySchemaManager.java
----------------------------------------------------------------------
diff --git 
a/eagle-core/eagle-query/eagle-storage-hbase/src/main/java/org/apache/eagle/storage/hbase/HBaseEntitySchemaManager.java
 
b/eagle-core/eagle-query/eagle-storage-hbase/src/main/java/org/apache/eagle/storage/hbase/HBaseEntitySchemaManager.java
index 354d641..8e4005c 100644
--- 
a/eagle-core/eagle-query/eagle-storage-hbase/src/main/java/org/apache/eagle/storage/hbase/HBaseEntitySchemaManager.java
+++ 
b/eagle-core/eagle-query/eagle-storage-hbase/src/main/java/org/apache/eagle/storage/hbase/HBaseEntitySchemaManager.java
@@ -65,7 +65,7 @@ public class HBaseEntitySchemaManager {
         try {
             admin = new HBaseAdmin(conf);
             Map<String, EntityDefinition> entityServiceMap = 
EntityDefinitionManager.entities();
-            if (entityServiceMap != null || entityServiceMap.values() != null) 
{
+            if (entityServiceMap != null) {
                 for (EntityDefinition entityDefinition : 
entityServiceMap.values()) {
                     createTable(entityDefinition);
                 }

Reply via email to