From 6243cf554140f48b43dae5b7fc97285c7ca9d69b Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 4 May 2011 11:34:47 +0200 Subject: [PATCH] fixed a bug. Some descriptors return null from their display name --- core/src/main/java/hudson/ExtensionComponent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/ExtensionComponent.java b/core/src/main/java/hudson/ExtensionComponent.java index 8b0af778d4..ed2a3211ae 100644 --- a/core/src/main/java/hudson/ExtensionComponent.java +++ b/core/src/main/java/hudson/ExtensionComponent.java @@ -77,7 +77,7 @@ public class ExtensionComponent implements Comparable> // make the order bit more deterministic among extensions of the same ordinal if (this.instance instanceof Descriptor) { - return ((Descriptor)this.instance).getDisplayName().compareTo(((Descriptor)that.instance).getDisplayName()); + return Util.fixNull(((Descriptor)this.instance).getDisplayName()).compareTo(Util.fixNull((((Descriptor)that.instance).getDisplayName()))); } else { return this.instance.getClass().getName().compareTo(that.instance.getClass().getName()); }