echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i2psnark: Fix NPE on torrent not found (ticket #2167)

Browse Source
This commit is contained in:
zzz
2018-02-14 17:35:23 +00:00
parent a62c6a8b96
commit 624c382652
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
View File

@ -2951,8 +2951,8 @@ public class I2PSnarkServlet extends BasicServlet {
if (parent) // always true
buf.append("<div class=\"page\">\n<div class=\"mainsection\">");
// for stop/start/check
final boolean er = isTopLevel && _manager.util().ratingsEnabled();
final boolean ec = isTopLevel && _manager.util().commentsEnabled(); // global setting
final boolean er = isTopLevel && snark != null && _manager.util().ratingsEnabled();
final boolean ec = isTopLevel && snark != null && _manager.util().commentsEnabled(); // global setting
final boolean esc = ec && _manager.getSavedCommentsEnabled(snark); // per-torrent setting
final boolean includeForm = showStopStart || showPriority || er || ec;
if (includeForm) {
@ -3237,7 +3237,7 @@ public class I2PSnarkServlet extends BasicServlet {
.append(_t("Resource Not found"))
.append("</th></tr><tr><td><b>").append(_t("Resource")).append(":</b></td><td>").append(r.toString())
.append("</td></tr><tr><td><b>").append(_t("Base")).append(":</b></td><td>").append(base)
.append("</td></tr><tr><td><b>").append(_t("Torrent")).append(":</b></td><td>").append(torrentName)
.append("</td></tr><tr><td><b>").append(_t("Torrent")).append(":</b></td><td>").append(DataHelper.escapeHTML(torrentName))
.append("</td></tr>\n");
}
buf.append("</table>\n");
@ -3248,7 +3248,7 @@ public class I2PSnarkServlet extends BasicServlet {
.append(_t("Resource Does Not Exist"))
.append("</th></tr><tr><td><b>").append(_t("Resource")).append(":</b></td><td>").append(r.toString())
.append("</td></tr><tr><td><b>").append(_t("Base")).append(":</b></td><td>").append(base)
.append("</td></tr><tr><td><b>").append(_t("Torrent")).append(":</b></td><td>").append(torrentName)
.append("</td></tr><tr><td><b>").append(_t("Torrent")).append(":</b></td><td>").append(DataHelper.escapeHTML(torrentName))
.append("</td></tr></table></div></div></center>\n</body>\n</html>");
return buf.toString();
}