Fix JENKINS-12364

jenkinsci · Apr 21, 2012 · ba87566 · ba87566
1 parent e5d5192
commit ba87566
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/CppcheckBuildAction.java b/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/CppcheckBuildAction.java
@@ -27,6 +27,7 @@
 import com.thalesgroup.hudson.plugins.cppcheck.config.CppcheckConfigGraph;
 import com.thalesgroup.hudson.plugins.cppcheck.graph.CppcheckGraph;
 import com.thalesgroup.hudson.plugins.cppcheck.model.CppcheckFile;
+import com.thalesgroup.hudson.plugins.cppcheck.model.CppcheckSourceContainer;
 import com.thalesgroup.hudson.plugins.cppcheck.util.AbstractCppcheckBuildAction;
 import com.thalesgroup.hudson.plugins.cppcheck.util.CppcheckBuildHealthEvaluator;
 import hudson.model.AbstractBuild;
@@ -164,7 +165,9 @@ private Object readResolve() {
         }
 
         //Result
-        org.jenkinsci.plugins.cppcheck.CppcheckResult newResult = new org.jenkinsci.plugins.cppcheck.CppcheckResult(newReport, result.getCppcheckSourceContainer(), getOwner());
+        CppcheckSourceContainer sourceContainer = result.getCppcheckSourceContainer();
+        org.jenkinsci.plugins.cppcheck.CppcheckSourceContainer newSourceContainer = new org.jenkinsci.plugins.cppcheck.CppcheckSourceContainer(sourceContainer.getInternalMap());
+        org.jenkinsci.plugins.cppcheck.CppcheckResult newResult = new org.jenkinsci.plugins.cppcheck.CppcheckResult(newReport, newSourceContainer, getOwner());
 
         //Config
         org.jenkinsci.plugins.cppcheck.config.CppcheckConfig newConfig = new org.jenkinsci.plugins.cppcheck.config.CppcheckConfig(

diff --git a/src/main/java/org/jenkinsci/plugins/cppcheck/CppcheckPublisher.java b/src/main/java/org/jenkinsci/plugins/cppcheck/CppcheckPublisher.java
@@ -12,7 +12,6 @@
 import hudson.tasks.BuildStepMonitor;
 import hudson.tasks.Publisher;
 import net.sf.json.JSONObject;
-import org.jenkinsci.CppcheckSourceContainer;
 import org.jenkinsci.plugins.cppcheck.config.CppcheckConfig;
 import org.jenkinsci.plugins.cppcheck.util.CppcheckBuildResultEvaluator;
 import org.kohsuke.stapler.StaplerRequest;

diff --git a/src/main/java/org/jenkinsci/plugins/cppcheck/CppcheckResult.java b/src/main/java/org/jenkinsci/plugins/cppcheck/CppcheckResult.java
@@ -6,7 +6,6 @@
 import hudson.model.Api;
 import hudson.model.Item;
 import org.apache.commons.lang.StringUtils;
-import org.jenkinsci.CppcheckSourceContainer;
 import org.jenkinsci.plugins.cppcheck.config.CppcheckConfig;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;

diff --git a/...rg/jenkinsci/CppcheckSourceContainer.java → ...ins/cppcheck/CppcheckSourceContainer.java b/...rg/jenkinsci/CppcheckSourceContainer.java → ...ins/cppcheck/CppcheckSourceContainer.java
@@ -1,4 +1,4 @@
-package org.jenkinsci;
+package org.jenkinsci.plugins.cppcheck;
 
 import com.thalesgroup.hudson.plugins.cppcheck.model.CppcheckFile;
 import com.thalesgroup.hudson.plugins.cppcheck.model.CppcheckWorkspaceFile;
@@ -18,6 +18,10 @@ public class CppcheckSourceContainer {
 
     private Map<Integer, CppcheckWorkspaceFile> internalMap = new HashMap<Integer, CppcheckWorkspaceFile>();
 
+    public CppcheckSourceContainer(Map<Integer, CppcheckWorkspaceFile> internalMap) {
+        this.internalMap = internalMap;
+    }
+
     public CppcheckSourceContainer(BuildListener listener,
                                    FilePath workspace,
                                    FilePath scmRootDir,