[FIXED JENKINS-14983] hpi:run fails with IllegalAccessError.

jenkinsci · Aug 29, 2012 · eb7a23f · eb7a23f
1 parent fc67a14
commit eb7a23f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/changelog.html b/changelog.html
@@ -66,7 +66,9 @@
   <li class=bug>
     <code>TarArchiver.visitSymlink</code> can throw undeclared <code>PosixException</code>.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-14922">issue 14922</a>)
-  <li class=>
+  <li class=bug>
+    <code>hpi:run</code> failed due to <code>IllegalAccessError</code>s.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-14983">issue 14983</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 

diff --git a/core/src/main/java/hudson/ExtensionComponent.java b/core/src/main/java/hudson/ExtensionComponent.java
@@ -26,6 +26,8 @@
 
 import hudson.model.Describable;
 import hudson.model.Descriptor;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import jenkins.ExtensionFilter;
 
 /**
@@ -38,6 +40,7 @@
  * @see ExtensionFilter
  */
 public class ExtensionComponent<T> implements Comparable<ExtensionComponent<T>> {
+    private static final Logger LOG = Logger.getLogger(ExtensionComponent.class.getName());
     private final T instance;
     private final double ordinal;
 
@@ -90,9 +93,14 @@ public int compareTo(ExtensionComponent<T> that) {
 
         // make the order bit more deterministic among extensions of the same ordinal
         if (this.instance instanceof Descriptor && that.instance instanceof Descriptor) {
-            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());
+            try {
+                return Util.fixNull(((Descriptor)this.instance).getDisplayName()).compareTo(Util.fixNull(((Descriptor)that.instance).getDisplayName()));
+            } catch (RuntimeException x) {
+                LOG.log(Level.WARNING, null, x);
+            } catch (LinkageError x) {
+                LOG.log(Level.WARNING, null, x);
+            }
         }
+        return this.instance.getClass().getName().compareTo(that.instance.getClass().getName());
     }
 }
diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/DropdownList.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/DropdownList.java
@@ -55,9 +55,9 @@ public List<SourceFile> getSourceFiles() {
     public static final class DescriptorImpl extends UISampleDescriptor {
     }
 
-    public static class Fruit implements ExtensionPoint, Describable<Fruit> {
+    public static abstract class Fruit implements ExtensionPoint, Describable<Fruit> {
         protected String name;
-        private Fruit(String name) { this.name = name; }
+        protected Fruit(String name) { this.name = name; }
 
         public Descriptor<Fruit> getDescriptor() {
             return Jenkins.getInstance().getDescriptor(getClass());