hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject hbase git commit: HBASE-15311 Prevent NPE in BlockCacheViewTmpl.
Date Thu, 25 Feb 2016 23:25:15 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.1 10d607717 -> 4743fde0a


HBASE-15311 Prevent NPE in BlockCacheViewTmpl.

Signed-off-by: stack <stack@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4743fde0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4743fde0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4743fde0

Branch: refs/heads/branch-1.1
Commit: 4743fde0a08ee926ca74139c49fdfcc61cb0f81b
Parents: 10d6077
Author: Samir Ahmic <samir@personal.com>
Authored: Tue Feb 23 11:34:09 2016 +0100
Committer: stack <stack@apache.org>
Committed: Thu Feb 25 15:25:07 2016 -0800

----------------------------------------------------------------------
 .../apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmpl.jamon | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/4743fde0/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmpl.jamon
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmpl.jamon
b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmpl.jamon
index 523d1b9..4870aae 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmpl.jamon
@@ -45,7 +45,7 @@ com.yammer.metrics.stats.Snapshot;
   if (bcn.equals("L1")) {
     bc = bcs == null || bcs.length == 0? bc: bcs[0];
   } else {
-    if (bcs.length < 2) {
+    if (bcs == null || bcs.length < 2) {
       System.out.println("There is no L2 block cache");
       return;
     }


Mime
View raw message