diff options
| author | Shawn Pearce | 2011-11-18 21:05:27 +0000 |
|---|---|---|
| committer | Code Review | 2011-11-18 21:05:27 +0000 |
| commit | ce02c82b824fa04cd6ca00affc9c8036e92c500a (patch) | |
| tree | f6b8362ea7d3b8268251af55c2c6adefc17a58de | |
| parent | 2b584b92165f8dc711a2a4dfb00d49af8fe84a3a (diff) | |
| parent | c0780bcb99de9195301ffdc2fcb16837161be5a4 (diff) | |
| download | jgit-ce02c82b824fa04cd6ca00affc9c8036e92c500a.tar.gz jgit-ce02c82b824fa04cd6ca00affc9c8036e92c500a.tar.xz jgit-ce02c82b824fa04cd6ca00affc9c8036e92c500a.zip | |
Merge changes I366435e2,I64577f8f
* changes:
[findBugs] Silence returning null for StringUtils.toBooleanOrNull()
[findBugs] Prefer short-cut logic as it's more performant
| -rw-r--r-- | org.eclipse.jgit/findBugs/FindBugsExcludeFilter.xml | 7 | ||||
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsReader.java | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/org.eclipse.jgit/findBugs/FindBugsExcludeFilter.xml b/org.eclipse.jgit/findBugs/FindBugsExcludeFilter.xml index 073f3da9d5..b8f300740a 100644 --- a/org.eclipse.jgit/findBugs/FindBugsExcludeFilter.xml +++ b/org.eclipse.jgit/findBugs/FindBugsExcludeFilter.xml @@ -45,4 +45,11 @@ <Class name="org.eclipse.jgit.util.TemporaryBuffer$BlockInputStream" /> <Bug pattern="UR_UNINIT_READ" /> </Match> + + <!-- Silence returning null for Boolean return type --> + <Match> + <Class name="org.eclipse.jgit.util.StringUtils" /> + <Method name="toBooleanOrNull" /> + <Bug pattern="NP_BOOLEAN_RETURN_NULL" /> + </Match> </FindBugsFilter> diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsReader.java index 02077a99ac..5d3f9a9354 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsReader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsReader.java @@ -688,7 +688,7 @@ final class DfsReader extends ObjectReader implements ObjectReuseAsIs { for (;;) { dstoff = block.inflate(inf, position, dstbuf, dstoff); - if (headerOnly & dstoff == dstbuf.length) + if (headerOnly && dstoff == dstbuf.length) return dstoff; if (inf.needsInput()) { position += block.remaining(position); |