Merge pull request #3 from jenkinsci/findbugs-enable

[FIXED JENKINS-29527] - AuthorizationMatrixProperty converter: Inheritance blocking may be passed incorrectly
jenkinsci · Jul 29, 2015 · 74cbb6e · 74cbb6e
2 parents a30a95b + 18a5840
commit 74cbb6e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
     <url>http://wiki.jenkins-ci.org/display/JENKINS/Matrix+Authorization+Strategy+Plugin</url>
     <properties>
       <findbugs-maven-plugin.version>3.0.1</findbugs-maven-plugin.version>
-      <findbugs.failOnError>false</findbugs.failOnError>
+      <findbugs.failOnError>true</findbugs.failOnError>
     </properties>
     <licenses>
         <license>

diff --git a/src/main/java/hudson/security/AuthorizationMatrixProperty.java b/src/main/java/hudson/security/AuthorizationMatrixProperty.java
@@ -306,9 +306,9 @@ public Object unmarshal(HierarchicalStreamReader reader,
 				reader.moveDown();
 				reader.getValue(); // we used to use this but not any more.
 				reader.moveUp();
-				prop = reader.peekNextChild();
+				prop = reader.peekNextChild(); // We check the next field
 			}
-			else if ("blocksInheritance".equals(prop)) {
+			if ("blocksInheritance".equals(prop)) {
 			    reader.moveDown();
 			    as.setBlocksInheritance("true".equals(reader.getValue()));
 			    reader.moveUp();