Merge "ReceivePack: Open visibility for some methods"

This commit is contained in:
Jonathan Nieder 2019-11-26 23:56:40 -05:00 committed by Gerrit Code Review @ Eclipse.org
commit 853098e13e
1 changed files with 10 additions and 2 deletions

View File

@ -1153,6 +1153,9 @@ private boolean hasError() {
/** /**
* Initialize the instance with the given streams. * Initialize the instance with the given streams.
* *
* Visible for out-of-tree subclasses (e.g. tests that need to set the
* streams without going through the {@link #service()} method).
*
* @param input * @param input
* raw input to read client commands and pack data from. Caller * raw input to read client commands and pack data from. Caller
* must ensure the input is buffered, otherwise read performance * must ensure the input is buffered, otherwise read performance
@ -1167,7 +1170,7 @@ private boolean hasError() {
* standard error channel of the command execution. For most * standard error channel of the command execution. For most
* other network connections this should be null. * other network connections this should be null.
*/ */
private void init(final InputStream input, final OutputStream output, protected void init(final InputStream input, final OutputStream output,
final OutputStream messages) { final OutputStream messages) {
origOut = output; origOut = output;
rawIn = input; rawIn = input;
@ -1207,10 +1210,15 @@ private Map<String, Ref> getAdvertisedOrDefaultRefs() {
/** /**
* Receive a pack from the stream and check connectivity if necessary. * Receive a pack from the stream and check connectivity if necessary.
* *
* Visible for out-of-tree subclasses. Subclasses overriding this method
* should invoke this implementation, as it alters the instance state (e.g.
* it reads the pack from the input and parses it before running the
* connectivity checks).
*
* @throws java.io.IOException * @throws java.io.IOException
* an error occurred during unpacking or connectivity checking. * an error occurred during unpacking or connectivity checking.
*/ */
private void receivePackAndCheckConnectivity() throws IOException { protected void receivePackAndCheckConnectivity() throws IOException {
receivePack(); receivePack();
if (needCheckConnectivity()) { if (needCheckConnectivity()) {
checkSubmodules(); checkSubmodules();