[JENKINS-41124] Post-merge tidy up and pick up cloudbees-folder 5.17-…

…beta-1
jenkinsci · Jan 22, 2017 · 93e7fa1 · 93e7fa1
1 parent 05030c1
commit 93e7fa1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -93,7 +93,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>cloudbees-folder</artifactId>
-      <version>5.17-20170119.163248-6</version>
+      <version>5.17-beta-1</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>

diff --git a/src/main/java/jenkins/branch/MultiBranchProject.java b/src/main/java/jenkins/branch/MultiBranchProject.java
@@ -170,8 +170,9 @@ public void onLoad(ItemGroup<? extends Item> parent, String name) throws IOExcep
         } catch (XStreamException e) {
             srcDigest = null;
         }
+        BranchProjectFactory<P, R> factory = getProjectFactory();
         try {
-            facDigest = Util.getDigestOf(Items.XSTREAM2.toXML(getProjectFactory()));
+            facDigest = Util.getDigestOf(Items.XSTREAM2.toXML(factory));
         } catch (XStreamException e) {
             facDigest = null;
         }
@@ -184,7 +185,6 @@ public void onLoad(ItemGroup<? extends Item> parent, String name) throws IOExcep
             LOGGER.log(Level.WARNING, "Could not read persisted state, will be recovered on next index.", e);
             state.reset();
         }
-        BranchProjectFactory<P, R> factory = getProjectFactory();
         // optimize lookup of sources by building a temporary map that is equivalent to getSCMSource(id) in results
         Map<String,SCMSource> sourceMap = new HashMap<>();
         for (BranchSource source : sources) {