motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge changes I28a5c7e2,If90a6cca 

* changes:
  Replace use of deprecated release() in BasePackPushConnection
  Replace use of deprecated release() in BasePackFetchConnection
This commit is contained in:
Shawn Pearce 2015-04-08 21:05:31 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent 5ef9c1709e 6691c20bc2
commit a0bc9560aa
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackFetchConnection.java
View File

@ -377,7 +377,7 @@ protected void doFetch(final ProgressMonitor monitor,
@Override @Override
public void close() { public void close() {
if (walk != null) if (walk != null)
walk.release(); walk.close();
super.close(); super.close();
} }
@ -753,16 +753,13 @@ private void receivePack(final ProgressMonitor monitor,
input = new SideBandInputStream(input, monitor, getMessageWriter(), input = new SideBandInputStream(input, monitor, getMessageWriter(),
outputStream); outputStream);
ObjectInserter ins = local.newObjectInserter(); try (ObjectInserter ins = local.newObjectInserter()) {
try {
PackParser parser = ins.newPackParser(input); PackParser parser = ins.newPackParser(input);
parser.setAllowThin(thinPack); parser.setAllowThin(thinPack);
parser.setObjectChecker(transport.getObjectChecker()); parser.setObjectChecker(transport.getObjectChecker());
parser.setLockMessage(lockMessage); parser.setLockMessage(lockMessage);
packLock = parser.parse(monitor); packLock = parser.parse(monitor);
ins.flush(); ins.flush();
} finally {
ins.release();
} }
} }

10
org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackPushConnection.java
View File

@ -279,9 +279,8 @@ private void writePack(final Map<String, RemoteRefUpdate> refUpdates,
Set<ObjectId> remoteObjects = new HashSet<ObjectId>(); Set<ObjectId> remoteObjects = new HashSet<ObjectId>();
Set<ObjectId> newObjects = new HashSet<ObjectId>(); Set<ObjectId> newObjects = new HashSet<ObjectId>();
final PackWriter writer = new PackWriter(transport.getPackConfig(), try (final PackWriter writer = new PackWriter(transport.getPackConfig(),
local.newObjectReader()); local.newObjectReader())) {
try {
for (final Ref r : getRefs()) { for (final Ref r : getRefs()) {
// only add objects that we actually have // only add objects that we actually have
@ -303,11 +302,10 @@ private void writePack(final Map<String, RemoteRefUpdate> refUpdates,
writer.setDeltaBaseAsOffset(capableOfsDelta); writer.setDeltaBaseAsOffset(capableOfsDelta);
writer.preparePack(monitor, newObjects, remoteObjects); writer.preparePack(monitor, newObjects, remoteObjects);
writer.writePack(monitor, monitor, out); writer.writePack(monitor, monitor, out);
} finally {
writer.release();
}
packTransferTime = writer.getStatistics().getTimeWriting(); packTransferTime = writer.getStatistics().getTimeWriting();
} }
}
private void readStatusReport(final Map<String, RemoteRefUpdate> refUpdates) private void readStatusReport(final Map<String, RemoteRefUpdate> refUpdates)
throws IOException { throws IOException {