Merge changes I28a5c7e2,If90a6cca
* changes: Replace use of deprecated release() in BasePackPushConnection Replace use of deprecated release() in BasePackFetchConnection
This commit is contained in:
commit
a0bc9560aa
|
@ -377,7 +377,7 @@ protected void doFetch(final ProgressMonitor monitor,
|
|||
@Override
|
||||
public void close() {
|
||||
if (walk != null)
|
||||
walk.release();
|
||||
walk.close();
|
||||
super.close();
|
||||
}
|
||||
|
||||
|
@ -753,16 +753,13 @@ private void receivePack(final ProgressMonitor monitor,
|
|||
input = new SideBandInputStream(input, monitor, getMessageWriter(),
|
||||
outputStream);
|
||||
|
||||
ObjectInserter ins = local.newObjectInserter();
|
||||
try {
|
||||
try (ObjectInserter ins = local.newObjectInserter()) {
|
||||
PackParser parser = ins.newPackParser(input);
|
||||
parser.setAllowThin(thinPack);
|
||||
parser.setObjectChecker(transport.getObjectChecker());
|
||||
parser.setLockMessage(lockMessage);
|
||||
packLock = parser.parse(monitor);
|
||||
ins.flush();
|
||||
} finally {
|
||||
ins.release();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -279,9 +279,8 @@ private void writePack(final Map<String, RemoteRefUpdate> refUpdates,
|
|||
Set<ObjectId> remoteObjects = new HashSet<ObjectId>();
|
||||
Set<ObjectId> newObjects = new HashSet<ObjectId>();
|
||||
|
||||
final PackWriter writer = new PackWriter(transport.getPackConfig(),
|
||||
local.newObjectReader());
|
||||
try {
|
||||
try (final PackWriter writer = new PackWriter(transport.getPackConfig(),
|
||||
local.newObjectReader())) {
|
||||
|
||||
for (final Ref r : getRefs()) {
|
||||
// only add objects that we actually have
|
||||
|
@ -303,10 +302,9 @@ private void writePack(final Map<String, RemoteRefUpdate> refUpdates,
|
|||
writer.setDeltaBaseAsOffset(capableOfsDelta);
|
||||
writer.preparePack(monitor, newObjects, remoteObjects);
|
||||
writer.writePack(monitor, monitor, out);
|
||||
} finally {
|
||||
writer.release();
|
||||
|
||||
packTransferTime = writer.getStatistics().getTimeWriting();
|
||||
}
|
||||
packTransferTime = writer.getStatistics().getTimeWriting();
|
||||
}
|
||||
|
||||
private void readStatusReport(final Map<String, RemoteRefUpdate> refUpdates)
|
||||
|
|
Loading…
Reference in New Issue