[JENKINS-40981] Request the instance from ExtensionList. Also set an …

…ordinal for a proper extension order.
jenkinsci · Jan 12, 2017 · 408bca7 · 408bca7
1 parent 376d47b
commit 408bca7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/configfiles/GlobalConfigFiles.java b/src/main/java/org/jenkinsci/plugins/configfiles/GlobalConfigFiles.java
@@ -17,7 +17,7 @@
  *
  * Created by domi on 17/09/16.
  */
-@Extension
+@Extension(ordinal = 5)
 public class GlobalConfigFiles extends Descriptor<GlobalConfigFiles> implements ConfigFileStore, ExtensionPoint, Describable<GlobalConfigFiles> {
 
     private Collection<Config> configs = new ArrayList<Config>();
@@ -27,7 +27,7 @@ public final Descriptor<GlobalConfigFiles> getDescriptor() {
     }
 
     public static GlobalConfigFiles get() {
-        GlobalConfigFiles instance = Jenkins.getActiveInstance().getDescriptorList(GlobalConfigFiles.class).get(GlobalConfigFiles.class);
+        GlobalConfigFiles instance = Jenkins.getActiveInstance().getExtensionList(GlobalConfigFiles.class).get(GlobalConfigFiles.class);
         if (instance == null) { // TODO would be useful to have an ExtensionList.getOrFail
             throw new IllegalStateException();
         }