mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-14 04:22:16 +00:00
Merged revisions 20928-20929,20939,20974-20975,20988,21009,21011,21015 via svnmerge from
https://www.dev.java.net/svn/hudson/branches/rc ........ r20928 | kohsuke | 2009-08-19 14:47:13 -0700 (Wed, 19 Aug 2009) | 1 line test bug fix. ........ r20929 | kohsuke | 2009-08-19 14:48:23 -0700 (Wed, 19 Aug 2009) | 1 line bumped up to a new version that has a trouble-shooting hook for resetting cached views ........ r20939 | kohsuke | 2009-08-19 15:20:57 -0700 (Wed, 19 Aug 2009) | 1 line picking up subversion 1.5 ........ r20974 | kohsuke | 2009-08-20 11:50:04 -0700 (Thu, 20 Aug 2009) | 3 lines Hudson can make mistakes in binding plugins to their right /plugin/NAME/ URLs. (<a href="http://www.nabble.com/Custom-Plugin---No-external-resources-available-td25064554.html">report</a>) ........ r20975 | kohsuke | 2009-08-20 12:05:11 -0700 (Thu, 20 Aug 2009) | 1 line Build history AJX update was buggy. ........ r20988 | kohsuke | 2009-08-20 17:01:57 -0700 (Thu, 20 Aug 2009) | 3 lines Hudson wasn't working on WebLogic on Windows. (<a href="http://www.nabble.com/Re%3A-Hudson-on-Weblogic-10.3-td25038378.html#a25043415">report</a>) ........ r21009 | kohsuke | 2009-08-21 14:21:35 -0700 (Fri, 21 Aug 2009) | 1 line [maven-release-plugin] prepare release hudson- ........ r21011 | kohsuke | 2009-08-21 14:22:00 -0700 (Fri, 21 Aug 2009) | 1 line [maven-release-plugin] prepare for next development iteration ........ r21015 | kohsuke | 2009-08-21 16:00:17 -0700 (Fri, 21 Aug 2009) | 1 line updated changelog as a part of the release ........ git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@21095 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
1 parent
2449716d30
commit
cbb3e313ad
15 files changed
+57
-19
No files matched your search
@@ -27,6 +27,7 @@ import hudson.PluginWrapper.Dependency;
|
||||
import hudson.util.IOException2;
|
||||
import hudson.util.MaskingClassLoader;
|
||||
import hudson.util.VersionNumber;
|
||||
import hudson.Plugin.DummyImpl;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.File;
|
||||
@@ -246,7 +247,7 @@ public class ClassicPluginStrategy implements PluginStrategy {
|
||||
String className = wrapper.getPluginClass();
|
||||
if(className==null) {
|
||||
// use the default dummy instance
|
||||
wrapper.setPlugin(Plugin.NONE);
|
||||
wrapper.setPlugin(new DummyImpl());
|
||||
} else {
|
||||
try {
|
||||
Class clazz = wrapper.classLoader.loadClass(className);
|
||||
|
||||
@@ -243,11 +243,12 @@ public abstract class Plugin implements Saveable {
|
||||
new File(Hudson.getInstance().getRootDir(),wrapper.getShortName()+".xml"));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Dummy instance of {@link Plugin} to be used when a plugin didn't
|
||||
* supply one on its own.
|
||||
*
|
||||
* @since 1.288
|
||||
* @since 1.321
|
||||
*/
|
||||
public static final Plugin NONE = new Plugin() {};
|
||||
public static final class DummyImpl extends Plugin {}
|
||||
}
|
||||
@@ -117,7 +117,7 @@ public class HistoryWidget<O extends ModelObject,T> extends Widget {
|
||||
if (baseList instanceof List) {
|
||||
lst = (List<T>) baseList;
|
||||
if(lst.size()>THRESHOLD)
|
||||
return lst.subList(0,THRESHOLD);
|
||||
return updateFirstTransientBuildKey(lst.subList(0,THRESHOLD));
|
||||
trimmed=false;
|
||||
return updateFirstTransientBuildKey(lst);
|
||||
} else {
|
||||
|
||||
Reference in new issue
Block a user