You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by te...@apache.org on 2015/02/03 23:52:49 UTC
incubator-slider git commit: Add check against null name in
IndexBlock#doIndex()
Repository: incubator-slider
Updated Branches:
refs/heads/develop fad546eab -> 06b2106ab
Add check against null name in IndexBlock#doIndex()
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/06b2106a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/06b2106a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/06b2106a
Branch: refs/heads/develop
Commit: 06b2106ab184b0df42e647ff26c0b1e944375cef
Parents: fad546e
Author: tedyu <yu...@gmail.com>
Authored: Tue Feb 3 14:52:33 2015 -0800
Committer: tedyu <yu...@gmail.com>
Committed: Tue Feb 3 14:52:33 2015 -0800
----------------------------------------------------------------------
.../org/apache/slider/server/appmaster/web/view/IndexBlock.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/06b2106a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/view/IndexBlock.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/view/IndexBlock.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/view/IndexBlock.java
index cfb74d3..5131b5e 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/view/IndexBlock.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/view/IndexBlock.java
@@ -66,7 +66,7 @@ public class IndexBlock extends HtmlBlock {
protected void doIndex(Hamlet html, String providerName) {
ClusterDescription clusterStatus = appView.getClusterStatus();
String name = clusterStatus.name;
- if (name.startsWith(" ") || name.endsWith(" ")) {
+ if (name != null && (name.startsWith(" ") || name.endsWith(" "))) {
name = "'" + name + "'";
}
DIV<Hamlet> div = html.div("general_info")