github
/
jgit
mirror of https://gitee.com/github-mirror-repo/jgit.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Set "potentialNullReference" to "error" level and fixed all issues 

There should be no functional change, the logic updated only to make
code simple so that compiler can understand what is going for. Removed
all @SuppressWarnings("null") annotations since they cannot be used if
"org.eclipse.jdt.core.compiler.problem.potentialNullReference" option is
set to the "error" level.

Bug: 470647
Change-Id: Ie93c249fa46e792198d362e531d5cbabaf41fdc4
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
stable-4.1
Andrey Loskutov 9 years ago
parent
847b3d1258
commit
b5941c74e5
5 changed files with 39 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      org.eclipse.jgit/.settings/org.eclipse.jdt.core.prefs
  2. 1
      org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheTree.java
  3. 18
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java
  4. 19
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java
  5. 3
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java

2
org.eclipse.jgit/.settings/org.eclipse.jdt.core.prefs
Unescape View File

@ -71,7 +71,7 @@ org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning

1
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheTree.java vendored
Unescape View File

@ -478,6 +478,7 @@ public class DirCacheTree {
// The entry is contained in this subtree. // The entry is contained in this subtree.
// //
assert(st != null);
st.validate(cache, cCnt, cIdx, pathOff + st.nameLength() + 1); st.validate(cache, cCnt, cIdx, pathOff + st.nameLength() + 1);
cIdx += st.entrySpan; cIdx += st.entrySpan;
entrySpan += st.entrySpan; entrySpan += st.entrySpan;

18
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java
Unescape View File

@ -533,7 +533,6 @@ public final class DfsPackFile {
return ByteBuffer.wrap(copyBuf, 0, bs); return ByteBuffer.wrap(copyBuf, 0, bs);
} }
@SuppressWarnings("null")
void copyAsIs(PackOutputStream out, DfsObjectToPack src, void copyAsIs(PackOutputStream out, DfsObjectToPack src,
boolean validate, DfsReader ctx) throws IOException, boolean validate, DfsReader ctx) throws IOException,
StoredObjectRepresentationNotAvailableException { StoredObjectRepresentationNotAvailableException {
@ -567,22 +566,26 @@ public final class DfsPackFile {
c = buf[headerCnt++] & 0xff; c = buf[headerCnt++] & 0xff;
} while ((c & 128) != 0); } while ((c & 128) != 0);
if (validate) { if (validate) {
assert(crc1 != null && crc2 != null);
crc1.update(buf, 0, headerCnt); crc1.update(buf, 0, headerCnt);
crc2.update(buf, 0, headerCnt); crc2.update(buf, 0, headerCnt);
} }
} else if (typeCode == Constants.OBJ_REF_DELTA) { } else if (typeCode == Constants.OBJ_REF_DELTA) {
if (validate) { if (validate) {
assert(crc1 != null && crc2 != null);
crc1.update(buf, 0, headerCnt); crc1.update(buf, 0, headerCnt);
crc2.update(buf, 0, headerCnt); crc2.update(buf, 0, headerCnt);
} }
readFully(src.offset + headerCnt, buf, 0, 20, ctx); readFully(src.offset + headerCnt, buf, 0, 20, ctx);
if (validate) { if (validate) {
assert(crc1 != null && crc2 != null);
crc1.update(buf, 0, 20); crc1.update(buf, 0, 20);
crc2.update(buf, 0, 20); crc2.update(buf, 0, 20);
} }
headerCnt += 20; headerCnt += 20;
} else if (validate) { } else if (validate) {
assert(crc1 != null && crc2 != null);
crc1.update(buf, 0, headerCnt); crc1.update(buf, 0, headerCnt);
crc2.update(buf, 0, headerCnt); crc2.update(buf, 0, headerCnt);
} }
@ -599,6 +602,7 @@ public final class DfsPackFile {
quickCopy = ctx.quickCopy(this, dataOffset, dataLength); quickCopy = ctx.quickCopy(this, dataOffset, dataLength);
if (validate && idx(ctx).hasCRC32Support()) { if (validate && idx(ctx).hasCRC32Support()) {
assert(crc1 != null);
// Index has the CRC32 code cached, validate the object. // Index has the CRC32 code cached, validate the object.
// //
expectedCRC = idx(ctx).findCRC32(src); expectedCRC = idx(ctx).findCRC32(src);
@ -622,6 +626,7 @@ public final class DfsPackFile {
Long.valueOf(src.offset), getPackName())); Long.valueOf(src.offset), getPackName()));
} }
} else if (validate) { } else if (validate) {
assert(crc1 != null);
// We don't have a CRC32 code in the index, so compute it // We don't have a CRC32 code in the index, so compute it
// now while inflating the raw data to get zlib to tell us // now while inflating the raw data to get zlib to tell us
// whether or not the data is safe. // whether or not the data is safe.
@ -709,19 +714,24 @@ public final class DfsPackFile {
while (cnt > 0) { while (cnt > 0) {
final int n = (int) Math.min(cnt, buf.length); final int n = (int) Math.min(cnt, buf.length);
readFully(pos, buf, 0, n, ctx); readFully(pos, buf, 0, n, ctx);
if (validate) if (validate) {
assert(crc2 != null);
crc2.update(buf, 0, n); crc2.update(buf, 0, n);
}
out.write(buf, 0, n); out.write(buf, 0, n);
pos += n; pos += n;
cnt -= n; cnt -= n;
} }
if (validate && crc2.getValue() != expectedCRC) { if (validate) {
assert(crc2 != null);
if (crc2.getValue() != expectedCRC) {
throw new CorruptObjectException(MessageFormat.format( throw new CorruptObjectException(MessageFormat.format(
JGitText.get().objectAtHasBadZlibStream, JGitText.get().objectAtHasBadZlibStream,
Long.valueOf(src.offset), getPackName())); Long.valueOf(src.offset), getPackName()));
} }
} }
} }
}
boolean invalid() { boolean invalid() {
return invalid; return invalid;
@ -837,7 +847,6 @@ public final class DfsPackFile {
return buf.position(); return buf.position();
} }
@SuppressWarnings("null")
ObjectLoader load(DfsReader ctx, long pos) ObjectLoader load(DfsReader ctx, long pos)
throws IOException { throws IOException {
try { try {
@ -934,6 +943,7 @@ public final class DfsPackFile {
if (data == null) if (data == null)
throw new LargeObjectException(); throw new LargeObjectException();
assert(delta != null);
do { do {
// Cache only the base immediately before desired object. // Cache only the base immediately before desired object.
if (cached) if (cached)

19
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java
Unescape View File

@ -366,7 +366,6 @@ public class PackFile implements Iterable<PackIndex.MutableEntry> {
} }
} }
@SuppressWarnings("null")
private void copyAsIs2(PackOutputStream out, LocalObjectToPack src, private void copyAsIs2(PackOutputStream out, LocalObjectToPack src,
boolean validate, WindowCursor curs) throws IOException, boolean validate, WindowCursor curs) throws IOException,
StoredObjectRepresentationNotAvailableException { StoredObjectRepresentationNotAvailableException {
@ -393,22 +392,26 @@ public class PackFile implements Iterable<PackIndex.MutableEntry> {
c = buf[headerCnt++] & 0xff; c = buf[headerCnt++] & 0xff;
} while ((c & 128) != 0); } while ((c & 128) != 0);
if (validate) { if (validate) {
assert(crc1 != null && crc2 != null);
crc1.update(buf, 0, headerCnt); crc1.update(buf, 0, headerCnt);
crc2.update(buf, 0, headerCnt); crc2.update(buf, 0, headerCnt);
} }
} else if (typeCode == Constants.OBJ_REF_DELTA) { } else if (typeCode == Constants.OBJ_REF_DELTA) {
if (validate) { if (validate) {
assert(crc1 != null && crc2 != null);
crc1.update(buf, 0, headerCnt); crc1.update(buf, 0, headerCnt);
crc2.update(buf, 0, headerCnt); crc2.update(buf, 0, headerCnt);
} }
readFully(src.offset + headerCnt, buf, 0, 20, curs); readFully(src.offset + headerCnt, buf, 0, 20, curs);
if (validate) { if (validate) {
assert(crc1 != null && crc2 != null);
crc1.update(buf, 0, 20); crc1.update(buf, 0, 20);
crc2.update(buf, 0, 20); crc2.update(buf, 0, 20);
} }
headerCnt += 20; headerCnt += 20;
} else if (validate) { } else if (validate) {
assert(crc1 != null && crc2 != null);
crc1.update(buf, 0, headerCnt); crc1.update(buf, 0, headerCnt);
crc2.update(buf, 0, headerCnt); crc2.update(buf, 0, headerCnt);
} }
@ -425,6 +428,7 @@ public class PackFile implements Iterable<PackIndex.MutableEntry> {
quickCopy = curs.quickCopy(this, dataOffset, dataLength); quickCopy = curs.quickCopy(this, dataOffset, dataLength);
if (validate && idx().hasCRC32Support()) { if (validate && idx().hasCRC32Support()) {
assert(crc1 != null);
// Index has the CRC32 code cached, validate the object. // Index has the CRC32 code cached, validate the object.
// //
expectedCRC = idx().findCRC32(src); expectedCRC = idx().findCRC32(src);
@ -457,6 +461,7 @@ public class PackFile implements Iterable<PackIndex.MutableEntry> {
if (quickCopy != null) { if (quickCopy != null) {
quickCopy.check(inf, tmp, dataOffset, (int) dataLength); quickCopy.check(inf, tmp, dataOffset, (int) dataLength);
} else { } else {
assert(crc1 != null);
long pos = dataOffset; long pos = dataOffset;
long cnt = dataLength; long cnt = dataLength;
while (cnt > 0) { while (cnt > 0) {
@ -476,6 +481,7 @@ public class PackFile implements Iterable<PackIndex.MutableEntry> {
JGitText.get().shortCompressedStreamAt, JGitText.get().shortCompressedStreamAt,
Long.valueOf(src.offset))); Long.valueOf(src.offset)));
} }
assert(crc1 != null);
expectedCRC = crc1.getValue(); expectedCRC = crc1.getValue();
} else { } else {
expectedCRC = -1; expectedCRC = -1;
@ -535,19 +541,24 @@ public class PackFile implements Iterable<PackIndex.MutableEntry> {
while (cnt > 0) { while (cnt > 0) {
final int n = (int) Math.min(cnt, buf.length); final int n = (int) Math.min(cnt, buf.length);
readFully(pos, buf, 0, n, curs); readFully(pos, buf, 0, n, curs);
if (validate) if (validate) {
assert(crc2 != null);
crc2.update(buf, 0, n); crc2.update(buf, 0, n);
}
out.write(buf, 0, n); out.write(buf, 0, n);
pos += n; pos += n;
cnt -= n; cnt -= n;
} }
if (validate && crc2.getValue() != expectedCRC) { if (validate) {
assert(crc2 != null);
if (crc2.getValue() != expectedCRC) {
throw new CorruptObjectException(MessageFormat.format( throw new CorruptObjectException(MessageFormat.format(
JGitText.get().objectAtHasBadZlibStream, JGitText.get().objectAtHasBadZlibStream,
Long.valueOf(src.offset), getPackFile())); Long.valueOf(src.offset), getPackFile()));
} }
} }
} }
}
boolean invalid() { boolean invalid() {
return invalid; return invalid;
@ -712,7 +723,6 @@ public class PackFile implements Iterable<PackIndex.MutableEntry> {
, getPackFile())); , getPackFile()));
} }
@SuppressWarnings("null")
ObjectLoader load(final WindowCursor curs, long pos) ObjectLoader load(final WindowCursor curs, long pos)
throws IOException, LargeObjectException { throws IOException, LargeObjectException {
try { try {
@ -811,6 +821,7 @@ public class PackFile implements Iterable<PackIndex.MutableEntry> {
if (data == null) if (data == null)
throw new IOException(JGitText.get().inMemoryBufferLimitExceeded); throw new IOException(JGitText.get().inMemoryBufferLimitExceeded);
assert(delta != null);
do { do {
// Cache only the base immediately before desired object. // Cache only the base immediately before desired object.
if (cached) if (cached)

3
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java
Unescape View File

@ -881,7 +881,6 @@ public class RefDirectory extends RefDatabase {
return n; return n;
} }
@SuppressWarnings("null")
private LooseRef scanRef(LooseRef ref, String name) throws IOException { private LooseRef scanRef(LooseRef ref, String name) throws IOException {
final File path = fileFor(name); final File path = fileFor(name);
FileSnapshot currentSnapshot = null; FileSnapshot currentSnapshot = null;
@ -920,6 +919,7 @@ public class RefDirectory extends RefDatabase {
final String target = RawParseUtils.decode(buf, 5, n); final String target = RawParseUtils.decode(buf, 5, n);
if (ref != null && ref.isSymbolic() if (ref != null && ref.isSymbolic()
&& ref.getTarget().getName().equals(target)) { && ref.getTarget().getName().equals(target)) {
assert(currentSnapshot != null);
currentSnapshot.setClean(otherSnapshot); currentSnapshot.setClean(otherSnapshot);
return ref; return ref;
} }
@ -934,6 +934,7 @@ public class RefDirectory extends RefDatabase {
id = ObjectId.fromString(buf, 0); id = ObjectId.fromString(buf, 0);
if (ref != null && !ref.isSymbolic() if (ref != null && !ref.isSymbolic()
&& ref.getTarget().getObjectId().equals(id)) { && ref.getTarget().getObjectId().equals(id)) {
assert(currentSnapshot != null);
currentSnapshot.setClean(otherSnapshot); currentSnapshot.setClean(otherSnapshot);
return ref; return ref;
} }

Write Preview
Loading…
Cancel
Save