Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-17879: Avoid NPE in snapshot.jsp when accessing without any request parameter 

Signed-off-by: Chia-Ping Tsai <chia7712@gmail.com>
This commit is contained in:
Abhishek Kumar 2017-04-22 18:16:20 +05:30 committed by Chia-Ping Tsai
parent 6edb8f8217
commit 1848353fd6
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp
View File

@ -36,14 +36,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 = snapshot.getTableName();
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 = snapshot.getTableName();
tableExists = admin.tableExists(snapshotTable);
break;
}
}
}
}
@ -110,7 +112,7 @@
<div class="container-fluid content">
<div class="row inner_header">
<div class="page-header">
<h1>Snapshot "<%= snapshotName %>" does not exists</h1>
<h1>Snapshot "<%= snapshotName %>" does not exist</h1>
</div>
</div>
<p>Go <a href="javascript:history.back()">Back</a>, or wait for the redirect.