motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Enable smart HTTP transport to place EOF at end of pack"

This commit is contained in:
Shawn O. Pearce 2012-03-13 14:50:27 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent 0705e95630 dfff04742f
commit 6e13dfab4a
2 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -673,6 +673,7 @@ private void markCommon(final RevObject obj, final AckNackResult anr)
}
private void receivePack(final ProgressMonitor monitor) throws IOException {
onReceivePack();
InputStream input = in;
if (sideband)
input = new SideBandInputStream(input, monitor, getMessageWriter());
@ -690,6 +691,15 @@ private void receivePack(final ProgressMonitor monitor) throws IOException {
}
}
/**
* Notification event delivered just before the pack is received from the
* network. This event can be used by RPC such as {@link TransportHttp} to
* disable its request magic and ensure the pack stream is read correctly.
*/
protected void onReceivePack() {
// By default do nothing for TCP based protocols.
}
private static class CancelledException extends Exception {
private static final long serialVersionUID = 1L;
}

32
org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java
View File

@ -687,6 +687,8 @@ void close() {
}
class SmartHttpFetchConnection extends BasePackFetchConnection {
private Service svc;
SmartHttpFetchConnection(final InputStream advertisement)
throws TransportException {
super(TransportHttp.this);
@ -701,9 +703,18 @@ class SmartHttpFetchConnection extends BasePackFetchConnection {
protected void doFetch(final ProgressMonitor monitor,
final Collection<Ref> want, final Set<ObjectId> have)
throws TransportException {
final Service svc = new Service(SVC_UPLOAD_PACK);
init(svc.in, svc.out);
super.doFetch(monitor, want, have);
try {
svc = new Service(SVC_UPLOAD_PACK);
init(svc.in, svc.out);
super.doFetch(monitor, want, have);
} finally {
svc = null;
}
}
@Override
protected void onReceivePack() {
svc.finalRequest = true;
}
}
@ -756,6 +767,8 @@ class Service {
private final HttpExecuteStream execute;
boolean finalRequest;
final UnionInputStream in;
final HttpOutputStream out;
@ -784,10 +797,14 @@ void execute() throws IOException {
out.close();
if (conn == null) {
// Output hasn't started yet, because everything fit into
// our request buffer. Send with a Content-Length header.
//
if (out.length() == 0) {
// Request output hasn't started yet, but more data is being
// requested. If there is no request data buffered and the
// final request was already sent, do nothing to ensure the
// caller is shown EOF on the InputStream; otherwise an
// programming error has occurred within this module.
if (finalRequest)
return;
throw new TransportException(uri,
JGitText.get().startingReadStageWithoutWrittenRequestDataPendingIsNotSupported);
}
@ -833,7 +850,8 @@ void execute() throws IOException {
}
in.add(openInputStream(conn));
in.add(execute);
if (!finalRequest)
in.add(execute);
conn = null;
}