← Back to branch summary

~ubuntu-branches/ubuntu/saucy/jenkins/saucy-proposed

« back to all changes in this revision

Viewing changes to core/src/main/java/hudson/model/ListView.java

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-08-13 12:35:19 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20130813123519-tizgfxcr70trl7r0
Tags: 1.509.2+dfsg-1
http://bugs.debian.org/706725
http://bugs.debian.org/701163
http://bugs.debian.org/704848
* New upstream release (Closes: #706725):
  - d/control: Update versioned BD's:
    * jenkins-executable-war >= 1.28.
    * jenkins-instance-identity >= 1.3.
    * libjenkins-remoting-java >= 2.23.
    * libjenkins-winstone-java >= 0.9.10-jenkins-44.
    * libstapler-java >= 1.207.
    * libjenkins-json-java >= 2.4-jenkins-1.
    * libstapler-adjunct-timeline-java >= 1.4.
    * libstapler-adjunct-codemirror-java >= 1.2.
    * libmaven-hpi-plugin-java >= 1.93.
    * libjenkins-xstream-java >= 1.4.4-jenkins-3.
  - d/maven.rules: Map to older version of animal-sniffer-maven-plugin.
  - Add patch for compatibility with guava >= 0.14.
  - Add patch to exclude asm4 dependency via jnr-posix.
  - Fixes the following security vulnerabilities:
    CVE-2013-2034, CVE-2013-2033, CVE-2013-2034, CVE-2013-1808
* d/patches/*: Switch to using git patch-queue for managing patches.
* De-duplicate jars between libjenkins-java and jenkins-external-job-monitor
  (Closes: #701163):
  - d/control: Add dependency between jenkins-external-job-monitor ->
    libjenkins-java.
  - d/rules: 
    Drop installation of jenkins-core in jenkins-external-job-monitor.
  - d/jenkins-external-job-monitor.{links,install}: Link to jenkins-core
    in /usr/share/java instead of included version.
* Wait longer for jenkins to stop during restarts (Closes: #704848):
  - d/jenkins.init: Re-sync init script from upstream codebase.

Show diffs side-by-side

added added

removed removed

Lines of Context:
core/src/main/java/hudson/model/ListView.java
42
42
 
43
43
import javax.annotation.concurrent.GuardedBy;
44
44
import javax.servlet.ServletException;
45
 
import javax.servlet.http.HttpServletResponse;
46
45
import java.io.IOException;
47
46
import java.util.ArrayList;
48
47
import java.util.LinkedHashSet;
155
154
 
156
155
        Boolean statusFilter = this.statusFilter; // capture the value to isolate us from concurrent update
157
156
        List<TopLevelItem> items = new ArrayList<TopLevelItem>(names.size());
158
 
        for (String n : names) {
159
 
            TopLevelItem item = getOwnerItemGroup().getItem(n);
 
157
        for (TopLevelItem item : getOwnerItemGroup().getItems()) {
 
158
            if (!names.contains(item.getName())) continue;
160
159
            // Add if no status filter or filter matches enabled/disabled status:
161
 
            if(item!=null && (statusFilter == null || !(item instanceof AbstractProject)
162
 
                              || ((AbstractProject)item).isDisabled() ^ statusFilter))
 
160
            if(statusFilter == null || !(item instanceof AbstractProject)
 
161
                              || ((AbstractProject)item).isDisabled() ^ statusFilter)
163
162
                items.add(item);
164
163
        }
165
164
 
292
291
    }
293
292
 
294
293
    @Extension
295
 
    public static final class DescriptorImpl extends ViewDescriptor {
 
294
    public static class DescriptorImpl extends ViewDescriptor {
296
295
        public String getDisplayName() {
297
296
            return Messages.ListView_DisplayName();
298
297
        }