瀏覽代碼

[spotbugs] Silence NP_BOOLEAN_RETURN_NULL in IgnoreNode#checkIgnored

Also mark the return value @Nullable to enable null analysis in Eclipse.

Change-Id: I5b286d657d432f4b32afd4dd370f76892b115422
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
tags/v5.11.0.202102031030-m2
Matthias Sohn 3 年之前
父節點
當前提交
1fd0a49ce0

+ 6
- 0
org.eclipse.jgit/findBugs/FindBugsExcludeFilter.xml 查看文件

@@ -77,6 +77,12 @@
<Bug pattern="NP_BOOLEAN_RETURN_NULL" />
</Match>

<Match>
<Class name="org.eclipse.jgit.ignore.IgnoreNode" />
<Method name="checkIgnored" />
<Bug pattern="NP_BOOLEAN_RETURN_NULL" />
</Match>

<!-- Transport initialization works like this -->
<Match>
<Class name="org.eclipse.jgit.transport.Transport" />

+ 4
- 1
org.eclipse.jgit/src/org/eclipse/jgit/ignore/IgnoreNode.java 查看文件

@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

import org.eclipse.jgit.annotations.Nullable;

/**
* Represents a bundle of ignore rules inherited from a base directory.
*
@@ -135,7 +137,8 @@ public class IgnoreNode {
* undetermined
* @since 4.11
*/
public Boolean checkIgnored(String entryPath, boolean isDirectory) {
public @Nullable Boolean checkIgnored(String entryPath,
boolean isDirectory) {
// Parse rules in the reverse order that they were read because later
// rules have higher priority
for (int i = rules.size() - 1; i > -1; i--) {

Loading…
取消
儲存