From fbec303bf18809c91dafc76afa238ecf84ed78c9 Mon Sep 17 00:00:00 2001 From: "Abhishek Kumar (72877)" Date: Thu, 13 Apr 2017 10:37:50 +0530 Subject: [PATCH] HBASE-17879 Avoid NPE in snapshot.jsp when accessing without any request parameter --- .../main/resources/hbase-webapps/master/snapshot.jsp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp b/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp index 6099a21..9f7f985 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp @@ -37,14 +37,16 @@ SnapshotInfo.SnapshotStats stats = null; TableName snapshotTable = null; boolean tableExists = false; - try (Admin admin = master.getConnection().getAdmin()) { - for (SnapshotDescription snapshotDesc: admin.listSnapshots()) { - if (snapshotName.equals(snapshotDesc.getName())) { - snapshot = snapshotDesc; - stats = SnapshotInfo.getSnapshotStats(conf, snapshot); - snapshotTable = TableName.valueOf(snapshot.getTable()); - tableExists = admin.tableExists(snapshotTable); - break; + if (snapshotName != null) { + try (Admin admin = master.getConnection().getAdmin()) { + for (SnapshotDescription snapshotDesc : admin.listSnapshots()) { + if (snapshotName.equals(snapshotDesc.getName())) { + snapshot = snapshotDesc; + stats = SnapshotInfo.getSnapshotStats(conf, snapshot); + snapshotTable = TableName.valueOf(snapshot.getTable()); + tableExists = admin.tableExists(snapshotTable); + break; + } } } } @@ -111,7 +113,7 @@

Go Back, or wait for the redirect. -- 2.10.2.windows.1