[EGIT PATCH 02/10] Rename the objectsUrl in the nested HttpObjectDB to
From: Robin Rosenberg <hidden>
Date: 2016-06-15 22:46:24
Subsystem:
the rest · Maintainer:
Linus Torvalds
It is used for looking at alternate objects, so name it such --- .../org/spearce/jgit/transport/TransportHttp.java | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/TransportHttp.java b/org.spearce.jgit/src/org/spearce/jgit/transport/TransportHttp.java
index fe4a437..38d26b3 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/transport/TransportHttp.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/TransportHttp.java@@ -112,15 +112,15 @@ public void close() { } class HttpObjectDB extends WalkRemoteObjectDatabase { - private final URL objectsUrl; + private final URL alternateObjectsUrl; HttpObjectDB(final URL b) { - objectsUrl = b; + alternateObjectsUrl = b; } @Override URIish getURI() { - return new URIish(objectsUrl); + return new URIish(alternateObjectsUrl); } @Override
@@ -143,7 +143,7 @@ URIish getURI() { @Override WalkRemoteObjectDatabase openAlternate(final String location) throws IOException { - return new HttpObjectDB(new URL(objectsUrl, location)); + return new HttpObjectDB(new URL(alternateObjectsUrl, location)); } @Override
@@ -171,7 +171,7 @@ WalkRemoteObjectDatabase openAlternate(final String location) @Override FileStream open(final String path) throws IOException { - final URL base = objectsUrl; + final URL base = alternateObjectsUrl; final URL u = new URL(base, path); final Proxy proxy = HttpSupport.proxyFor(proxySelector, u); final HttpURLConnection c;
@@ -201,10 +201,10 @@ FileStream open(final String path) throws IOException { } } catch (IOException err) { try { - throw new TransportException(new URL(objectsUrl, INFO_REFS) + throw new TransportException(new URL(alternateObjectsUrl, INFO_REFS) + ": cannot read available refs", err); } catch (MalformedURLException mue) { - throw new TransportException(objectsUrl + INFO_REFS + throw new TransportException(alternateObjectsUrl + INFO_REFS + ": cannot read available refs", err); } }
--
1.6.1.285.g35d8b