summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
diff options
context:
space:
mode:
authorShawn Pearce <spearce@spearce.org>2015-05-28 15:37:09 -0400
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>2015-05-28 15:37:11 -0400
commit5426ba2778deae852c8250cf26b6c487beb9ea8a (patch)
treec90bf1a5a7da915d30f935b2ba88b03deab3b4c3 /org.eclipse.jgit
parent10b99121b06f4a4a16e410dc905a6c7dd669caf9 (diff)
parentbb48901ddff79f0d81000b7e383fba9a8be6d23c (diff)
downloadjgit-5426ba2778deae852c8250cf26b6c487beb9ea8a.tar.gz
jgit-5426ba2778deae852c8250cf26b6c487beb9ea8a.zip
Merge "Silence false potential null pointer access warnings"
Diffstat (limited to 'org.eclipse.jgit')
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java
index e03488b3cf..75b0646ed0 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java
@@ -533,6 +533,7 @@ public final class DfsPackFile {
return ByteBuffer.wrap(copyBuf, 0, bs);
}
+ @SuppressWarnings("null")
void copyAsIs(PackOutputStream out, DfsObjectToPack src,
boolean validate, DfsReader ctx) throws IOException,
StoredObjectRepresentationNotAvailableException {
@@ -836,6 +837,7 @@ public final class DfsPackFile {
return buf.position();
}
+ @SuppressWarnings("null")
ObjectLoader load(DfsReader ctx, long pos)
throws IOException {
try {