opendev/gerrit
Code Issues Proposed changes

Bump JGit to v4.0.0.201506090130-r

Browse Source 
This JGit version includes the bugfix [1] which is an attempt to fix the
"Cannot read project" issue in Gerrit, as discussed in [2] and [3].

This version of JGit also removes the 'release()' method in many
interfaces/classes in favor or the implementing the AutoCloseable
interface. In stable-2.10 we just replace all usages of the release()
method with the close() method. Refactoring the code to make use of the
AutoCloseable in stable-2.10 would be a larger change which wouldn't
justify itself as we don't expect any major development in stable-2.10
and the usage of AutoCloseable in the master branch is already done.

[1] https://git.eclipse.org/r/48288
[2] https://groups.google.com/forum/#!topic/repo-discuss/ZeGWPyyJlrM
[3] https://groups.google.com/forum/#!topic/repo-discuss/CYYoHfDxCfA

Change-Id: Ie540296238e3bbaf453c9e29426825431e15d423
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Saša Živkov
2015-05-26 17:31:37 +02:00
parent 1ff91c0d82
commit 6b870dece5
46 changed files with 90 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/GitUtil.java
View File

@@ -184,7 +184,7 @@ public class GitUtil {
return ChangeIdUtil.computeChangeId(null, null, i, i, msg);
}
} finally {
rw.release();
rw.close();
}
}

4
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmitOnPushIT.java
View File

@@ -292,7 +292,7 @@ public class SubmitOnPushIT extends AbstractDaemonTest {
assertEquals(admin.email, c.getAuthorIdent().getEmailAddress());
assertEquals(admin.email, c.getCommitterIdent().getEmailAddress());
} finally {
rw.release();
rw.close();
}
} finally {
r.close();
@@ -310,7 +310,7 @@ public class SubmitOnPushIT extends AbstractDaemonTest {
assertEquals(admin.email, c.getAuthorIdent().getEmailAddress());
assertEquals(serverIdent.getEmailAddress(), c.getCommitterIdent().getEmailAddress());
} finally {
rw.release();
rw.close();
}
} finally {
r.close();

6
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
View File

@@ -265,7 +265,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
repo.getRef("refs/heads/master").getObjectId()));
return Lists.newArrayList(rw);
} finally {
rw.release();
rw.close();
}
} finally {
repo.close();
@@ -278,7 +278,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
try {
return rw.parseCommit(repo.getRef(name).getObjectId());
} finally {
rw.release();
rw.close();
}
} finally {
repo.close();
@@ -300,7 +300,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
ObjectId newTreeId = repo.resolve("refs/heads/master^{tree}");
return getLatestDiff(repo, oldTreeId, newTreeId);
} finally {
rw.release();
rw.close();
}
} finally {
repo.close();

4
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateProjectIT.java
View File

@@ -252,8 +252,8 @@ public class CreateProjectIT extends AbstractDaemonTest {
tw.reset();
}
} finally {
tw.release();
rw.release();
tw.close();
rw.close();
repo.close();
}
}

2
gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/CatServlet.java
View File

@@ -209,7 +209,7 @@ public class CatServlet extends HttpServlet {
return;
}
} finally {
reader.release();
reader.close();
}
} catch (IOException e) {
getServletContext().log("Cannot read repository", e);

6
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/AllProjectsConfig.java
View File

@@ -136,15 +136,15 @@ public class AllProjectsConfig extends VersionedMetaData {
updateRef(repo, ident, newRevision, "commit: " + msg);
revision = newRevision;
} finally {
rw.release();
rw.close();
}
} finally {
if (inserter != null) {
inserter.release();
inserter.close();
inserter = null;
}
if (reader != null) {
reader.release();
reader.close();
reader = null;
}
}

8
gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java
View File

@@ -300,7 +300,7 @@ public class ChangeUtil {
oi.flush();
revertCommit = revWalk.parseCommit(id);
} finally {
oi.release();
oi.close();
}
RefControl refControl = ctl.getRefControl();
@@ -364,7 +364,7 @@ public class ChangeUtil {
return change.getId();
} finally {
revWalk.release();
revWalk.close();
}
} finally {
git.close();
@@ -423,7 +423,7 @@ public class ChangeUtil {
oi.flush();
newCommit = revWalk.parseCommit(id);
} finally {
oi.release();
oi.close();
}
PatchSet.Id id = nextPatchSetId(git, change.currentPatchSetId());
@@ -446,7 +446,7 @@ public class ChangeUtil {
return change.getId();
} finally {
revWalk.release();
revWalk.close();
}
} finally {
git.close();

2
gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java
View File

@@ -228,7 +228,7 @@ public class ChangeKindCacheImpl implements ChangeKindCache {
}
} finally {
key.repo = null;
walk.release();
walk.close();
}
}

4
gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickChange.java
View File

@@ -154,7 +154,7 @@ public class CherryPickChange {
mergeUtilFactory.create(projectState).createCherryPickFromCommit(git, oi, mergeTip,
commitToCherryPick, committerIdent, commitMessage, revWalk);
} finally {
oi.release();
oi.close();
}
if (cherryPickCommit == null) {
@@ -192,7 +192,7 @@ public class CherryPickChange {
cherryPickCommit, refControl, identifiedUser);
}
} finally {
revWalk.release();
revWalk.close();
}
} finally {
git.close();

4
gerrit-server/src/main/java/com/google/gerrit/server/change/CreateChange.java
View File

@@ -184,7 +184,7 @@ public class CreateChange implements
return Response.created(json.format(change.getId()));
} finally {
rw.release();
rw.close();
}
} finally {
git.close();
@@ -250,7 +250,7 @@ public class CreateChange implements
commit.setMessage(commitMessage);
emptyCommit = rw.parseCommit(insert(oi, commit));
} finally {
oi.release();
oi.close();
}
return emptyCommit;
}

2
gerrit-server/src/main/java/com/google/gerrit/server/change/Files.java
View File

@@ -274,7 +274,7 @@ public class Files implements ChildCollection<RevisionResource, FileResource> {
db.get().accountPatchReviews().insert(inserts);
return pathList;
} finally {
reader.release();
reader.close();
}
} finally {
git.close();

4
gerrit-server/src/main/java/com/google/gerrit/server/change/GetArchive.java
View File

@@ -126,7 +126,7 @@ public class GetArchive implements RestReadView<RevisionResource> {
@Override
public void close() throws IOException {
rw.release();
rw.close();
repo.close();
}
};
@@ -139,7 +139,7 @@ public class GetArchive implements RestReadView<RevisionResource> {
return bin;
} finally {
if (close) {
rw.release();
rw.close();
}
}
} finally {

4
gerrit-server/src/main/java/com/google/gerrit/server/change/GetContent.java
View File

@@ -73,10 +73,10 @@ public class GetContent implements RestReadView<FileResource> {
};
return result.setContentLength(object.getSize()).base64();
} finally {
tw.release();
tw.close();
}
} finally {
rw.release();
rw.close();
}
} finally {
repo.close();

4
gerrit-server/src/main/java/com/google/gerrit/server/change/GetPatch.java
View File

@@ -102,7 +102,7 @@ public class GetPatch implements RestReadView<RevisionResource> {
@Override
public void close() throws IOException {
rw.release();
rw.close();
repo.close();
}
};
@@ -123,7 +123,7 @@ public class GetPatch implements RestReadView<RevisionResource> {
return bin;
} finally {
if (close) {
rw.release();
rw.close();
}
}
} finally {

2
gerrit-server/src/main/java/com/google/gerrit/server/change/GetRelated.java
View File

@@ -83,7 +83,7 @@ public class GetRelated implements RestReadView<RevisionResource> {
info.changes = walk(rsrc, rw, ref);
return info;
} finally {
rw.release();
rw.close();
}
} finally {
git.close();

4
gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedIn.java
View File

@@ -71,7 +71,7 @@ class IncludedIn implements RestReadView<ChangeResource> {
}
return new IncludedInInfo(IncludedInResolver.resolve(r, rw, rev));
} finally {
rw.release();
rw.close();
}
} finally {
r.close();
@@ -87,4 +87,4 @@ class IncludedIn implements RestReadView<ChangeResource> {
tags = in.getTags();
}
}
}
}

2
gerrit-server/src/main/java/com/google/gerrit/server/change/Mergeable.java
View File

@@ -245,7 +245,7 @@ public class Mergeable implements RestReadView<RevisionResource> {
"Cannot merge test change %d", change.getId().get()), e);
return false;
} finally {
rw.release();
rw.close();
}
}

4
gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java
View File

@@ -142,10 +142,10 @@ public class RebaseChange {
throw new IOException(e.getMessage());
} finally {
if (inserter != null) {
inserter.release();
inserter.close();
}
if (rw != null) {
rw.release();
rw.close();
}
if (git != null) {
git.close();

6
gerrit-server/src/main/java/com/google/gerrit/server/git/BanCommit.java
View File

@@ -69,7 +69,7 @@ public class BanCommit {
RevCommit map = rw.parseCommit(ref.getObjectId());
return NoteMap.read(rw.getObjectReader(), map);
} finally {
rw.release();
rw.close();
}
} catch (IOException badMap) {
throw new IOException("Cannot load " + RefNames.REFS_REJECT_COMMITS,
@@ -138,8 +138,8 @@ public class BanCommit {
}
return result;
} finally {
revWalk.release();
inserter.release();
revWalk.close();
inserter.close();
}
} finally {
repo.close();

4
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
View File

@@ -304,10 +304,10 @@ public class MergeOp {
throw new MergeException("Cannot query the database", e);
} finally {
if (inserter != null) {
inserter.release();
inserter.close();
}
if (rw != null) {
rw.release();
rw.close();
}
if (repo != null) {
repo.close();

2
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java
View File

@@ -671,7 +671,7 @@ public class MergeUtil {
}
@Override
public void release() {
public void close() {
}
});
return (ThreeWayMerger) m;

4
gerrit-server/src/main/java/com/google/gerrit/server/git/NotesBranchUtil.java
View File

@@ -153,8 +153,8 @@ public class NotesBranchUtil {
}
updateRef(notesBranch);
} finally {
revWalk.release();
reader.release();
revWalk.close();
reader.close();
}
}

4
gerrit-server/src/main/java/com/google/gerrit/server/git/SubmoduleOp.java
View File

@@ -383,7 +383,7 @@ public class SubmoduleOp {
+ subscriber.get(), e);
} finally {
if (recRw != null) {
recRw.release();
recRw.close();
}
if (pdb != null) {
pdb.close();
@@ -403,7 +403,7 @@ public class SubmoduleOp {
b.finish();
return dc;
} finally {
rw.release();
rw.close();
}
}

4
gerrit-server/src/main/java/com/google/gerrit/server/git/TagSet.java
View File

@@ -147,7 +147,7 @@ class TagSet {
}
} finally {
if (rw != null) {
rw.release();
rw.close();
}
}
}
@@ -189,7 +189,7 @@ class TagSet {
} catch (IOException e) {
log.warn("Error building tags for repository " + projectName, e);
} finally {
rw.release();
rw.close();
}
}

6
gerrit-server/src/main/java/com/google/gerrit/server/git/VersionedMetaData.java
View File

@@ -117,7 +117,7 @@ public abstract class VersionedMetaData {
revision = id != null ? new RevWalk(reader).parseCommit(id) : null;
onLoad();
} finally {
reader.release();
reader.close();
reader = null;
}
}
@@ -306,12 +306,12 @@ public abstract class VersionedMetaData {
newTree = null;
if (inserter != null) {
inserter.release();
inserter.close();
inserter = null;
}
if (reader != null) {
reader.release();
reader.close();
reader = null;
}
}

6
gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeBatchIndexer.java
View File

@@ -319,7 +319,7 @@ public class ChangeBatchIndexer {
getPathsAndIndex(id);
}
} finally {
walk.release();
walk.close();
}
return null;
}
@@ -353,7 +353,7 @@ public class ChangeBatchIndexer {
}
}
} finally {
df.release();
df.close();
}
} catch (Exception e) {
fail("Failed to index commit " + b.name(), false, e);
@@ -398,7 +398,7 @@ public class ChangeBatchIndexer {
oi.flush();
return id;
} finally {
oi.release();
oi.close();
}
}

2
gerrit-server/src/main/java/com/google/gerrit/server/mail/ChangeEmail.java
View File

@@ -407,7 +407,7 @@ public abstract class ChangeEmail extends NotificationEmail {
log.error("Cannot format patch", e);
return "";
} finally {
fmt.release();
fmt.close();
git.close();
}
}

2
gerrit-server/src/main/java/com/google/gerrit/server/mail/PatchSetNotificationSender.java
View File

@@ -95,7 +95,7 @@ public class PatchSetNotificationSender {
commit = revWalk.parseCommit(ObjectId.fromString(
updatedPatchSet.getRevision().get()));
} finally {
revWalk.release();
revWalk.close();
}
final PatchSetInfo info = patchSetInfoFactory.get(commit, updatedPatchSet.getId());
final List<FooterLine> footerLines = commit.getFooterLines();

2
gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java
View File

@@ -575,7 +575,7 @@ public class ChangeNotes extends AbstractChangeNotes<ChangeNotes> {
// TODO(yyonas): figure out how to handle this exception
throw new IOException(e1);
} finally {
walk.release();
walk.close();
}
}

2
gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchFile.java
View File

@@ -75,7 +75,7 @@ public class PatchFile {
bTree = bCommit.getTree();
}
} finally {
reader.release();
reader.close();
}
}

8
gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java
View File

@@ -189,7 +189,7 @@ public class PatchListLoader extends CacheLoader<PatchListKey, PatchList> {
return new PatchList(a, b, againstParent,
entries.toArray(new PatchListEntry[entries.size()]));
} finally {
reader.release();
reader.close();
}
}
@@ -342,7 +342,7 @@ public class PatchListLoader extends CacheLoader<PatchListKey, PatchList> {
}
@Override
public void release() {
public void close() {
}
});
@@ -454,7 +454,7 @@ public class PatchListLoader extends CacheLoader<PatchListKey, PatchList> {
return rw.lookupTree(treeId);
} finally {
ins.release();
ins.close();
}
}
@@ -465,7 +465,7 @@ public class PatchListLoader extends CacheLoader<PatchListKey, PatchList> {
oi.flush();
return id;
} finally {
oi.release();
oi.close();
}
}
}

2
gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java
View File

@@ -119,7 +119,7 @@ class PatchScriptBuilder {
try {
return build(content, comments, history);
} finally {
reader.release();
reader.close();
}
}

2
gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java
View File

@@ -94,7 +94,7 @@ public class PatchSetInfoFactory {
info.setParents(toParentInfos(src.getParents(), rw));
return info;
} finally {
rw.release();
rw.close();
}
} catch (IOException e) {
throw new PatchSetInfoNotAvailableException(e);

2
gerrit-server/src/main/java/com/google/gerrit/server/project/CommitsCollection.java
View File

@@ -75,7 +75,7 @@ public class CommitsCollection implements
} catch (MissingObjectException | IncorrectObjectTypeException e) {
throw new ResourceNotFoundException(id);
} finally {
rw.release();
rw.close();
}
} finally {
repo.close();

2
gerrit-server/src/main/java/com/google/gerrit/server/project/GetHead.java
View File

@@ -71,7 +71,7 @@ public class GetHead implements RestReadView<ProjectResource> {
}
throw new AuthException("not allowed to see HEAD");
} finally {
rw.release();
rw.close();
}
}
throw new ResourceNotFoundException(Constants.HEAD);

4
gerrit-server/src/main/java/com/google/gerrit/server/project/ListDashboards.java
View File

@@ -100,7 +100,7 @@ class ListDashboards implements RestReadView<ProjectResource> {
}
return all;
} finally {
rw.release();
rw.close();
}
} finally {
git.close();
@@ -134,7 +134,7 @@ class ListDashboards implements RestReadView<ProjectResource> {
}
}
} finally {
tw.release();
tw.close();
}
return list;
}

2
gerrit-server/src/main/java/com/google/gerrit/server/project/PerformCreateProject.java
View File

@@ -300,7 +300,7 @@ public class PerformCreateProject {
+ createProjectArgs.getProjectName(), e);
throw e;
} finally {
oi.release();
oi.close();
}
}
}

2
gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeData.java
View File

@@ -466,7 +466,7 @@ public class ChangeData {
commitMessage = c.getFullMessage();
commitFooters = c.getFooterLines();
} finally {
walk.release();
walk.close();
}
} finally {
repo.close();

2
gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsPredicate.java
View File

@@ -138,7 +138,7 @@ class ConflictsPredicate extends OrPredicate<ChangeData> {
} catch (NoSuchProjectException e) {
throw new IllegalStateException(e);
} finally {
rw.release();
rw.close();
}
} finally {
repo.close();

2
gerrit-server/src/main/java/com/google/gerrit/server/query/change/RevWalkPredicate.java
View File

@@ -109,7 +109,7 @@ public abstract class RevWalkPredicate extends OperatorPredicate<ChangeData> {
try {
return match(repo, rw, args);
} finally {
rw.release();
rw.close();
}
} finally {
repo.close();

4
gerrit-server/src/main/java/gerrit/PRED_commit_edits_2.java
View File

@@ -130,7 +130,7 @@ public class PRED_commit_edits_2 extends Predicate.P2 {
} catch (IOException err) {
throw new JavaException(this, 1, err);
} finally {
reader.release();
reader.close();
}
return engine.fail();
@@ -161,4 +161,4 @@ public class PRED_commit_edits_2 extends Predicate.P2 {
}
return new Text(reader.open(tw.getObjectId(0), Constants.OBJ_BLOB));
}
}
}

2
gerrit-server/src/test/java/com/google/gerrit/server/change/IncludedInResolverTest.java
View File

@@ -127,7 +127,7 @@ public class IncludedInResolverTest extends RepositoryTestCase {
@After
public void tearDown() throws Exception {
revWalk.release();
revWalk.close();
super.tearDown();
}

16
gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java
View File

@@ -218,7 +218,7 @@ public class ChangeNotesTest {
assertEquals(author.getWhen(), committer.getWhen());
assertEquals(author.getTimeZone(), committer.getTimeZone());
} finally {
walk.release();
walk.close();
}
}
@@ -243,7 +243,7 @@ public class ChangeNotesTest {
+ "Patch-set: 1\n",
commit.getFullMessage());
} finally {
walk.release();
walk.close();
}
}
@@ -264,7 +264,7 @@ public class ChangeNotesTest {
+ "Label: -Code-Review\n",
commit.getFullMessage());
} finally {
walk.release();
walk.close();
}
}
@@ -312,7 +312,7 @@ public class ChangeNotesTest {
assertEquals(author.getWhen(), committer.getWhen());
assertEquals(author.getTimeZone(), committer.getTimeZone());
} finally {
walk.release();
walk.close();
}
}
@@ -337,7 +337,7 @@ public class ChangeNotesTest {
+ "Submitted-with: RULE_ERROR Problem with patch set: 1\n",
commit.getFullMessage());
} finally {
walk.release();
walk.close();
}
}
@@ -717,7 +717,7 @@ public class ChangeNotesTest {
+ "Reviewer: Change Owner <1@gerrit>\n",
commit.getFullMessage());
} finally {
walk.release();
walk.close();
}
ChangeNotes notes = newNotes(c);
@@ -748,7 +748,7 @@ public class ChangeNotesTest {
+ "Patch-set: 1\n",
commit.getFullMessage());
} finally {
walk.release();
walk.close();
}
ChangeNotes notes = newNotes(c);
@@ -789,7 +789,7 @@ public class ChangeNotesTest {
+ "Patch-set: 1\n",
commit.getFullMessage());
} finally {
walk.release();
walk.close();
}
ChangeNotes notes = newNotes(c);

4
gerrit-server/src/test/java/com/google/gerrit/server/tools/hooks/CommitMsgHookTest.java
View File

@@ -431,7 +431,7 @@ public class CommitMsgHookTest extends HookTestCase {
oi.flush();
return e;
} finally {
oi.release();
oi.close();
}
}
@@ -457,7 +457,7 @@ public class CommitMsgHookTest extends HookTestCase {
fail(Constants.HEAD + " did not change: " + ref.getResult());
}
} finally {
oi.release();
oi.close();
}
}
}

12
lib/jgit/BUCK
View File

@@ -1,13 +1,13 @@
include_defs('//lib/maven.defs')
REPO = MAVEN_CENTRAL # Leave here even if set to MAVEN_CENTRAL.
VERS = '4.0.0.201505050340-m2'
VERS = '4.0.0.201506090130-r'
maven_jar(
name = 'jgit',
id = 'org.eclipse.jgit:org.eclipse.jgit:' + VERS,
bin_sha1 = '1cc3120d39ed2b55584e631634e65c5d2e6c1cf7',
src_sha1 = '425f578cc9d5ccb8f3b050a5ab1e2d7a0becb25d',
bin_sha1 = '859b5dbae0372bc0744503b9593119410c0474f2',
src_sha1 = '5a7b7e179852c20f6af8581b96cf6441b23025a5',
license = 'jgit',
repository = REPO,
unsign = True,
@@ -22,7 +22,7 @@ maven_jar(
maven_jar(
name = 'jgit-servlet',
id = 'org.eclipse.jgit:org.eclipse.jgit.http.server:' + VERS,
sha1 = '2a9f55d1d92afef795542b995db6ab261007857f',
sha1 = 'd86da25c9e1042612ebe3be1e027cce4d9a8e4c9',
license = 'jgit',
repository = REPO,
deps = [':jgit'],
@@ -36,7 +36,7 @@ maven_jar(
maven_jar(
name = 'jgit-archive',
id = 'org.eclipse.jgit:org.eclipse.jgit.archive:' + VERS,
sha1 = 'ee3954753067818f8f734981a01c13ac33425f2c',
sha1 = '3b1f5cefdd65bbe81851f638ee1f461c9cb5df20',
license = 'jgit',
repository = REPO,
deps = [':jgit',
@@ -53,7 +53,7 @@ maven_jar(
maven_jar(
name = 'junit',
id = 'org.eclipse.jgit:org.eclipse.jgit.junit:' + VERS,
sha1 = '6cc19f8f0a1791e26d4225625ecba6a31d9b830e',
sha1 = 'e86c5b8ec06624d3cd2b8c11fd0c528281751329',
license = 'DO_NOT_DISTRIBUTE',
repository = REPO,
unsign = True,

2
plugins/reviewnotes

Submodule plugins/reviewnotes updated: 61702414c0...0b5aab6820