Fix JENKINS-24140

jenkinsci · Aug 14, 2014 · f11b368 · f11b368
1 parent ca7b1c8
commit f11b368
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 49 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/artifactdeployer/DeployedArtifacts.java b/src/main/java/org/jenkinsci/plugins/artifactdeployer/DeployedArtifacts.java
@@ -9,6 +9,7 @@
 /**
  * @author Gregory Boissinot
  */
+@Deprecated
 public class DeployedArtifacts implements Action {
 
     private Map<Integer, List<ArtifactDeployerVO>> deployedArtifactsInfo = new HashMap<Integer, List<ArtifactDeployerVO>>();
@@ -29,4 +30,11 @@ public Map<Integer, List<ArtifactDeployerVO>> getDeployedArtifactsInfo() {
         return deployedArtifactsInfo;
     }
 
+    @SuppressWarnings("unused")
+    private Object readResolve() {
+        final ArtifactDeployerBuildAction artifactDeployerBuildAction = new ArtifactDeployerBuildAction();
+        artifactDeployerBuildAction.setArtifactsInfo(null, deployedArtifactsInfo);
+        return artifactDeployerBuildAction;
+    }
+
 }
diff --git a/.../jenkinsci/plugins/artifactdeployer/migration/DeployedArtifactsMigrationItemListener.java b/.../jenkinsci/plugins/artifactdeployer/migration/DeployedArtifactsMigrationItemListener.java
diff --git a/...main/resources/org/jenkinsci/plugins/artifactdeployer/DeployedArtifactsResult/index.jelly b/...main/resources/org/jenkinsci/plugins/artifactdeployer/DeployedArtifactsResult/index.jelly
@@ -24,11 +24,16 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
     <l:layout norefresh="true">
-        <st:include it="${it.owner}" page="sidepanel.jelly"/>
+        <j:if test="${it.owner != null}">
+            <st:include it="${it.owner}" page="sidepanel.jelly"/>
+        </j:if>
         <l:main-panel>
             <h1>
                 <img src="${imagesURL}/48x48/package.gif" alt="" height="48" width="48"/>
-                ${%Deployed Artifacts} #${it.owner.number}
+                ${%Deployed Artifacts}
+                <j:if test="${it.owner != null}">
+                    #${it.owner.number}
+                </j:if>
             </h1>
             <j:set var="latestDeployedArtifacts" value="${it.allArtifacts}"/>
             <table class="fileList">