mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-08 17:46:03 +00:00
Merged revisions 19665-19668,19675-19677,19683-19684,19692-19696,19701,19706-19708,19716-19722,19730,19737,19802-19803 via svnmerge from
https://www.dev.java.net/svn/hudson/branches/rc ........ r19665 | kohsuke | 2009-07-13 10:48:59 -0700 (Mon, 13 Jul 2009) | 1 line merged the RC branch back. This time I saw a lot of strange merge failures. Is svnmerge interfering with Subversion 1.6 somehow? ........ r19666 | kohsuke | 2009-07-13 10:58:37 -0700 (Mon, 13 Jul 2009) | 1 line fixed a compilation problem ........ r19667 | kohsuke | 2009-07-13 11:51:29 -0700 (Mon, 13 Jul 2009) | 1 line The default view is now configurable. ........ r19668 | kohsuke | 2009-07-13 12:20:49 -0700 (Mon, 13 Jul 2009) | 1 line added a reference to a typical way of creating a Launcher ........ r19675 | kohsuke | 2009-07-13 18:58:37 -0700 (Mon, 13 Jul 2009) | 1 line doc improvement. ........ r19676 | kohsuke | 2009-07-13 18:58:59 -0700 (Mon, 13 Jul 2009) | 1 line this makes it easier for me to discover the related tests ........ r19677 | kohsuke | 2009-07-13 19:02:23 -0700 (Mon, 13 Jul 2009) | 3 lines Fixed a bug in Winstone that may result in "unable to create new native thread" error (<a href="http://www.nabble.com/OutOfMemoryError-on-all-jobs-after-a-while-td24408800.html">report</a>) ........ r19683 | kohsuke | 2009-07-13 20:55:43 -0700 (Mon, 13 Jul 2009) | 1 line [FIXED HUDSON-1920] Applied a patch. In 1.316. ........ r19684 | kohsuke | 2009-07-13 21:17:00 -0700 (Mon, 13 Jul 2009) | 1 line bumped up to 0.8 to fix IE7 rendering problem ........ r19692 | kohsuke | 2009-07-14 10:22:18 -0700 (Tue, 14 Jul 2009) | 1 line added an icon for plugins ........ r19693 | kohsuke | 2009-07-14 10:22:32 -0700 (Tue, 14 Jul 2009) | 1 line forgot to commit this file ........ r19694 | kohsuke | 2009-07-14 10:31:12 -0700 (Tue, 14 Jul 2009) | 1 line replaced the icon ........ r19695 | kohsuke | 2009-07-14 10:38:17 -0700 (Tue, 14 Jul 2009) | 3 lines Tentatively added additional extension points to control queue behaviors. (<a href="http://www.nabble.com/Queue-handling-contribution-td24322512.html">patch</a>) ........ r19696 | kohsuke | 2009-07-14 11:48:03 -0700 (Tue, 14 Jul 2009) | 3 lines Fixed a possible NPEs with the slavestatus plugin. (<a href="http://www.nabble.com/Hudson-throws-NPE-after-upgrade-to-1.1315-td24476619.html">report</a>) ........ r19701 | kohsuke | 2009-07-14 14:33:15 -0700 (Tue, 14 Jul 2009) | 1 line cherry picking from rev.19592. ........ r19706 | kohsuke | 2009-07-14 17:03:13 -0700 (Tue, 14 Jul 2009) | 1 line fixed possible NPE ........ r19707 | kohsuke | 2009-07-14 17:03:37 -0700 (Tue, 14 Jul 2009) | 1 line doc fix ........ r19708 | kohsuke | 2009-07-14 17:41:37 -0700 (Tue, 14 Jul 2009) | 1 line improved error diagnostics ........ r19716 | kohsuke | 2009-07-14 18:58:46 -0700 (Tue, 14 Jul 2009) | 3 lines Fixed a possible StringIndexOutOfBoundsException with Windows process execution. (<a href="https://hudson.dev.java.net/issues/show_bug.cgi?id=4034">issue 4034</a>) ........ r19717 | mindless | 2009-07-14 19:01:52 -0700 (Tue, 14 Jul 2009) | 2 lines [FIXED HUDSON-4011] translation correction from flominator ........ r19718 | kohsuke | 2009-07-14 19:02:24 -0700 (Tue, 14 Jul 2009) | 1 line [FIXED HUDSON-4032] Fixed in 1.316. ........ r19719 | kohsuke | 2009-07-14 19:09:23 -0700 (Tue, 14 Jul 2009) | 1 line [HUDSON-3984] Added logging. ........ r19720 | kohsuke | 2009-07-14 19:12:19 -0700 (Tue, 14 Jul 2009) | 1 line [HUDSON-3984] Added logging. ........ r19721 | kohsuke | 2009-07-14 19:14:40 -0700 (Tue, 14 Jul 2009) | 1 line [HUDSON-3984] Added logging. ........ r19722 | kohsuke | 2009-07-14 20:14:34 -0700 (Tue, 14 Jul 2009) | 1 line modernized. ........ r19730 | kohsuke | 2009-07-15 11:49:16 -0700 (Wed, 15 Jul 2009) | 1 line [FIXED HUDSON-3803] In 1.316. ........ r19737 | kohsuke | 2009-07-15 12:44:53 -0700 (Wed, 15 Jul 2009) | 1 line creating a new RC branch ........ r19802 | kohsuke | 2009-07-16 19:22:06 -0700 (Thu, 16 Jul 2009) | 3 lines resurrected URLClassLoader code and made that a default after Tom reported a performance problem during a start up, caused by repeated attempt to load a non-existent class. Our current theory is that the AntClassLoader.getResourceStream(...) does repeated file system stat calls, and we suspect that is slow on NTFS. Caching a failure should help boost the performance. ........ r19803 | kohsuke | 2009-07-16 19:31:41 -0700 (Thu, 16 Jul 2009) | 3 lines // see http://www.nabble.com/404-Not-Found-error-when-clicking-on-help-td24508544.html // I suspect some containers are returning directory names. ........ git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@19805 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
kohsuke committed
1 parent
b029bf585f
commit
0b162cb9dc
3 files changed
+24
-5
No files matched your search
@@ -36,6 +36,7 @@ import java.io.FilenameFilter;
|
||||
import java.io.IOException;
|
||||
import java.io.Closeable;
|
||||
import java.net.URL;
|
||||
import java.net.URLClassLoader;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
@@ -163,12 +164,23 @@ public class ClassicPluginStrategy implements PluginStrategy {
|
||||
|
||||
ClassLoader dependencyLoader = new DependencyClassLoader(getBaseClassLoader(atts), Util.join(dependencies,optionalDependencies));
|
||||
|
||||
// using AntClassLoader with Closeable so that we can predictably release jar files opened by URLClassLoader
|
||||
AntClassLoader2 classLoader = new AntClassLoader2(dependencyLoader);
|
||||
classLoader.addPathFiles(paths);
|
||||
ClassLoader cl;
|
||||
if(useAntClassLoader) {
|
||||
// using AntClassLoader with Closeable so that we can predictably release jar files opened by URLClassLoader
|
||||
AntClassLoader2 classLoader = new AntClassLoader2(dependencyLoader);
|
||||
classLoader.addPathFiles(paths);
|
||||
cl = classLoader;
|
||||
} else {
|
||||
// Tom reported that AntClassLoader has a performance issue when Hudson keeps trying to load a class that doesn't exist,
|
||||
// so providing a legacy URLClassLoader support, too
|
||||
List<URL> urls = new ArrayList<URL>();
|
||||
for (File path : paths)
|
||||
urls.add(path.toURI().toURL());
|
||||
cl = new URLClassLoader(urls.toArray(new URL[urls.size()]),dependencyLoader);
|
||||
}
|
||||
|
||||
return new PluginWrapper(archive, manifest, baseResourceURL,
|
||||
classLoader, disableFile, dependencies, optionalDependencies);
|
||||
cl, disableFile, dependencies, optionalDependencies);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -410,4 +422,6 @@ public class ClassicPluginStrategy implements PluginStrategy {
|
||||
cleanup();
|
||||
}
|
||||
}
|
||||
|
||||
public static boolean useAntClassLoader = Boolean.getBoolean(ClassicPluginStrategy.class.getName()+".useAntClassLoader");
|
||||
}
|
||||
Reference in new issue
Block a user