motiejus
/
jgit
1
Fork 0
Code Releases Activity

ReceivePack: integrate push option parsing into recvCommands 

This allows the same try/catch to handle parsing the command list,
push certificate and push options. Any errors will be caught and
handled by the same catch block, as the client is in the same state.

Change-Id: I13a66f9100e2dc8ca8f72cd701a5bd44d093ec84
This commit is contained in:
Shawn Pearce 2016-08-29 12:11:11 -07:00
parent 2fd4559773
commit 3100662a5a
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java
View File

@ -1171,6 +1171,9 @@ protected void recvCommands() throws IOException {
}
}
pushCert = certParser.build();
if (hasCommands()) {
readPostCommands(pckIn);
}
} catch (PackProtocolException e) {
if (sideBand) {
try {
@ -1217,6 +1220,16 @@ static ReceiveCommand parseCommand(String line) throws PackProtocolException {
return new ReceiveCommand(oldId, newId, name);
}
/**
* @param in
* request stream.
* @throws IOException
* request line cannot be read.
*/
void readPostCommands(PacketLineIn in) throws IOException {
// Do nothing by default.
}
/** Enable capabilities based on a previously read capabilities line. */
protected void enableCapabilities() {
sideBand = isCapabilityEnabled(CAPABILITY_SIDE_BAND_64K);

21
org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
View File

@ -220,14 +220,17 @@ protected void enableCapabilities() {
super.enableCapabilities();
}
private void readPushOptions() throws IOException {
pushOptions = new ArrayList<>(4);
for (;;) {
String option = pckIn.readString();
if (option == PacketLineIn.END) {
break;
@Override
void readPostCommands(PacketLineIn in) throws IOException {
if (usePushOptions) {
pushOptions = new ArrayList<>(4);
for (;;) {
String option = in.readString();
if (option == PacketLineIn.END) {
break;
}
pushOptions.add(option);
}
pushOptions.add(option);
}
}
@ -241,10 +244,6 @@ private void service() throws IOException {
return;
recvCommands();
if (hasCommands()) {
if (usePushOptions) {
readPushOptions();
}
Throwable unpackError = null;
if (needPack()) {
try {