Skip to content
Permalink
Browse files

[JENKINS-25440] Merged #2072.

  • Loading branch information...
jglick committed Mar 4, 2016
2 parents ec95aa5 + 1a2d822 commit 290af8dd1f196815c703a1761fc8a884516f2879
Showing with 8 additions and 3 deletions.
  1. +3 −1 changelog.html
  2. +5 −2 core/src/main/java/hudson/ExtensionFinder.java
@@ -55,7 +55,9 @@
<!-- Record your changes in the trunk here. -->
<div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
<ul class=image>
<li class=>
<li class="bug">
Under some conditions Jenkins startup could fail because of incorrectly linked extensions; now recovering more gracefully.
(<a href-"https://issues.jenkins-ci.org/browse/JENKINS-25440">issue 25440</a>)
</ul>
</div><!--=TRUNK-END=-->
<h3><a name=v1.651>What's new in 1.651</a> (2016/02/28)</h3>
@@ -282,7 +282,6 @@ protected void configure() {
LOGGER.log(Level.SEVERE, "Failed to create Guice container from all the plugins",e);
// failing to load all bindings are disastrous, so recover by creating minimum that works
// by just including the core
// TODO this recovery is pretty much useless; startup crashes anyway
container = Guice.createInjector(new SezpozModule(loadSezpozIndices(Jenkins.class.getClassLoader())));
}

@@ -479,7 +478,11 @@ private void resolve(Class c) {
m.invoke(ecl, c);
c.getConstructors();
c.getMethods();
c.getFields();
for (Field f : c.getFields()) {
if (f.getAnnotation(javax.inject.Inject.class) != null || f.getAnnotation(com.google.inject.Inject.class) != null) {
resolve(f.getType());
}
}
LOGGER.log(Level.FINER, "{0} looks OK", c);
while (c != Object.class) {
c.getGenericSuperclass();

0 comments on commit 290af8d

Please sign in to comment.
You can’t perform that action at this time.