← Back to branch summary

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

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-02-17 17:11:13 UTC
  • mfrom: (5.1.11 experimental)
  • Revision ID: package-import@ubuntu.com-20130217171113-eooiq8e14nie0h3v
Tags: 1.480.3+dfsg-1~exp1
http://bugs.debian.org/700761
http://bugs.debian.org/679616
http://bugs.debian.org/698834
http://bugs.debian.org/698835
* New upstream release (Closes: #700761, #679616):
  - d/control: Versioned BD jenkins-remoting >= 2.22.
  - d/control: Versioned BD jenkins-winstone >= 0.9.10-jenkins-42.
  - d/control: Versioned BD stapler >= 1.198.
  - d/maven.ignoreRules: Ignore new slave-launcher modules until
    packaged.
  - Refreshed patches.
  - Fixes the following security vulnerabilities:
    CVE-2013-0327, CVE-2013-0328, CVE-2013-0329, CVE-2013-0330,
    CVE-2013-0331
* d/control: Versioned BD trilead-putty-extension (>= 1.2)
  (Closes: #698834).
* d/control: Add net-tools and procps dependencies to jenkins
  (Closes: #698835).
* d/rules,control, *.upstart.in: Rejig upstart/init configurations now
  that debhelper does the right thing across Debian/Ubuntu.
* d/rules,plugin_parent.pom.in: Drop as good plugin parent pom now
  provided upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
core/src/main/java/hudson/model/Descriptor.java
72
72
import java.lang.reflect.Field;
73
73
import java.lang.reflect.ParameterizedType;
74
74
import java.beans.Introspector;
 
75
import javax.annotation.CheckForNull;
75
76
 
76
77
/**
77
78
 * Metadata about a configurable instance.
909
910
            for (Object o : JSONArray.fromObject(formData)) {
910
911
                JSONObject jo = (JSONObject)o;
911
912
                String kind = jo.getString("kind");
912
 
                items.add(find(descriptors,kind).newInstance(req,jo));
 
913
                Descriptor<T> d = find(descriptors, kind);
 
914
                if (d != null) {
 
915
                    items.add(d.newInstance(req, jo));
 
916
                }
913
917
            }
914
918
        }
915
919
 
919
923
    /**
920
924
     * Finds a descriptor from a collection by its class name.
921
925
     */
922
 
    public static <T extends Descriptor> T find(Collection<? extends T> list, String className) {
 
926
    public static @CheckForNull <T extends Descriptor> T find(Collection<? extends T> list, String className) {
923
927
        for (T d : list) {
924
928
            if(d.getClass().getName().equals(className))
925
929
                return d;
933
937
        return null;
934
938
    }
935
939
 
936
 
    public static Descriptor find(String className) {
 
940
    public static @CheckForNull Descriptor find(String className) {
937
941
        return find(Jenkins.getInstance().getExtensionList(Descriptor.class),className);
938
942
    }
939
943