[jenkins] 02/02: Fixed a ClassCastException caused by the patch disabling bytecode-compatibility-transformer

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jenkins.

commit 1e321bec456a95fd5e805dec1f97ee1d1d30ad94
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Sep 15 19:23:24 2014 +0200

    Fixed a ClassCastException caused by the patch disabling bytecode-compatibility-transformer
---
 .../0023-ignore-bytecode-compatibility-transformer.patch       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/patches/0023-ignore-bytecode-compatibility-transformer.patch b/debian/patches/0023-ignore-bytecode-compatibility-transformer.patch
index 7d02951..02051bc 100644
--- a/debian/patches/0023-ignore-bytecode-compatibility-transformer.patch
+++ b/debian/patches/0023-ignore-bytecode-compatibility-transformer.patch
@@ -11,16 +11,20 @@ Forwarded: not-needed
  import org.kohsuke.accmod.Restricted;
  import org.kohsuke.accmod.restrictions.NoExternalUse;
  import org.kohsuke.args4j.Argument;
-@@ -237,8 +236,7 @@
+@@ -237,10 +236,9 @@
      /**
       * List of all {@link Trigger}s for this project.
       */
 -    @AdaptField(was=List.class)
 -    protected volatile DescribableList<Trigger<?>,TriggerDescriptor> triggers = new DescribableList<Trigger<?>,TriggerDescriptor>(this);
+-    private static final AtomicReferenceFieldUpdater<AbstractProject,DescribableList> triggersUpdater
+-            = AtomicReferenceFieldUpdater.newUpdater(AbstractProject.class,DescribableList.class,"triggers");
 +    protected volatile List<Trigger<?>> triggers = new DescribableList<Trigger<?>,TriggerDescriptor>(this);
-     private static final AtomicReferenceFieldUpdater<AbstractProject,DescribableList> triggersUpdater
-             = AtomicReferenceFieldUpdater.newUpdater(AbstractProject.class,DescribableList.class,"triggers");
++    private static final AtomicReferenceFieldUpdater<AbstractProject,List> triggersUpdater
++            = AtomicReferenceFieldUpdater.newUpdater(AbstractProject.class,List.class,"triggers");
  
+     /**
+      * {@link Action}s contributed from subsidiary objects associated with
 @@ -338,7 +336,7 @@
          if (triggers == null) {
              triggersUpdater.compareAndSet(this,null,new DescribableList<Trigger<?>,TriggerDescriptor>(this));

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins.git