[FIXED JENKINS-23107] Check to ensure that there is a build with a wo…

…rkspace available
jenkinsci · Jul 6, 2014 · 08df4c8 · 08df4c8
1 parent f184814
commit 08df4c8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/main/java/jenkins/plugins/svnmerge/FeatureBranchProperty.java b/src/main/java/jenkins/plugins/svnmerge/FeatureBranchProperty.java
@@ -156,7 +156,13 @@ public long rebase(final TaskListener listener, final long upstreamRev) throws I
 
         final ModuleLocation upstreamLocation = getUpstreamSubversionLocation();
 
-        return owner.getModuleRoot().act(new FileCallable<Long>() {
+        AbstractBuild build = owner.getSomeBuildWithWorkspace();
+        if (build == null) {
+            final PrintStream logger = listener.getLogger();
+            logger.print("No workspace found for project! Please perform a build first.\n");
+            return -1L;
+        }
+        return build.getModuleRoot().act(new FileCallable<Long>() {
             public Long invoke(File mr, VirtualChannel virtualChannel) throws IOException {
                 try {
                     final PrintStream logger = listener.getLogger();

diff --git a/src/main/resources/jenkins/plugins/svnmerge/IntegrationStatusAction/index.groovy b/src/main/resources/jenkins/plugins/svnmerge/IntegrationStatusAction/index.groovy
@@ -20,10 +20,9 @@ l.layout(norefresh:true, title:_("title",my.project.displayName)) {
 
         if (ia==null) {
             p {
-                raw("""
-                This project has not been integrated to
-                <a href="${Functions.getRelativeLinkTo(my.branchProperty.upstreamProject)}">the upstream</a> yet."
-                """)
+                text("This project has not been integrated to ")
+                a(href: Functions.getRelativeLinkTo(my.branchProperty.upstreamProject), "the upstream")
+                text(" yet.")
             }
         } else {
             p {