[FIXED JENKINS-25424] Register the descriptor

jenkinsci · Dec 6, 2014 · 8040741 · 8040741
1 parent 2cb6669
commit 8040741
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/main/java/hudson/plugins/xvnc/DisplayAllocator.java b/src/main/java/hudson/plugins/xvnc/DisplayAllocator.java
@@ -1,13 +1,14 @@
 package hudson.plugins.xvnc;
 
+import hudson.Extension;
 import hudson.model.Node;
 import hudson.slaves.NodeProperty;
+import hudson.slaves.NodePropertyDescriptor;
 
 import java.util.HashSet;
 import java.util.Random;
 import java.util.Set;
 
-import hudson.slaves.NodePropertyDescriptor;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
@@ -83,6 +84,7 @@ private Object readResolve() {
             return this;
         }
 
+        @Extension
         public static class DescriptorImpl extends NodePropertyDescriptor {
 
             @Override

diff --git a/src/test/java/hudson/plugins/xvnc/XvncTest.java b/src/test/java/hudson/plugins/xvnc/XvncTest.java
@@ -23,11 +23,13 @@
  */
 package hudson.plugins.xvnc;
 
+import static org.junit.Assert.assertTrue;
 import hudson.Launcher;
 import hudson.model.BuildListener;
 import hudson.model.FreeStyleBuild;
 import hudson.model.Result;
 import hudson.model.AbstractBuild;
+import hudson.model.Descriptor;
 import hudson.model.FreeStyleProject;
 import hudson.model.Hudson;
 import hudson.plugins.xvnc.Xvnc.DescriptorImpl;
@@ -125,6 +127,12 @@ public void avoidNpeAfterDeserialiation() throws Exception {
         j.buildAndAssertSuccess(p);
     }
 
+    @Test @Bug(25424)
+    public void jenkins25424() {
+        Descriptor<?> desc = j.jenkins.getDescriptorOrDie(DisplayAllocator.Property.class);
+        assertTrue(desc instanceof DisplayAllocator.Property.DescriptorImpl);
+    }
+
     private Xvnc fakeXvncRun(FreeStyleProject p) throws Exception {
         final Xvnc xvnc = new Xvnc(false, false);
         p.getBuildWrappersList().add(xvnc);