JENKINS-19858, JENKINS-14521, JENKINS-18794

jenkinsci · Oct 2, 2013 · 06db241 · 06db241
1 parent 52acc7d
commit 06db241
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/main/java/configurationslicing/maven/MavenVersionSlicer.java b/src/main/java/configurationslicing/maven/MavenVersionSlicer.java
@@ -54,7 +54,7 @@ public List<String> getValues(AbstractProject item) {
 			} else {
 				List<String> ret = new ArrayList<String>();
 				List<Maven> builders = getBuilders(item);
-				if (builders.isEmpty()) {
+				if (builders == null || builders.isEmpty()) {
 					return ret;
 				}
 				String last = null;
@@ -75,6 +75,10 @@ public List<String> getValues(AbstractProject item) {
 		}
 		private List<Maven> getBuilders(AbstractProject item) {
 			DescribableList<Builder,Descriptor<Builder>> buildersList = AbstractBuildCommandSliceSpec.getBuildersList(item);
+			// JENKINS-18794 - couldn't reproduce, but this is the problematic line
+			if (buildersList == null) {
+				return null;
+			}
 			List<Maven> builders = buildersList.getAll(Maven.class);
 			return builders;
 		}

diff --git a/src/main/resources/configurationslicing/ConfigurationSlicing/SliceExecutor/index.jelly b/src/main/resources/configurationslicing/ConfigurationSlicing/SliceExecutor/index.jelly
@@ -1,5 +1,5 @@
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
-  <l:layout title="${it.displayName}">
+  <l:layout title="${it.displayName}" norefresh="true">
     <st:include page="sidepanel-executor.jelly" it="${it}"/>
     <l:main-panel>
       <f:form method="post" name="sliceconfig" action="sliceconfigSubmit">

diff --git a/src/main/resources/configurationslicing/UnorderedStringSlice/sliceconfig.jelly b/src/main/resources/configurationslicing/UnorderedStringSlice/sliceconfig.jelly
@@ -4,11 +4,13 @@
 		<tr><th><b>
 		${it.spec.configuredValueDescription}
 		</b></th>
+		<th><st:nbsp /></th>
 		<th><b>Item Names</b></th></tr>
 		<j:forEach var="configuredValue" items="${it.configuredValues}">
 		<tr>
 			<td width="50%"><f:textarea name="configValue" value="${configuredValue}"/></td>
-			<td width="50%"><f:textarea name="itemNames" value="${it.getItemNamesString(configuredValue)}"/></td>
+			<td width="1%"><st:nbsp /></td>
+			<td width="49%"><f:textarea name="itemNames" value="${it.getItemNamesString(configuredValue)}"/></td>
 		</tr>
 		</j:forEach>
 	</table>