motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge changes I91883560,I1b12a976 

* changes:
  Fix package exports in org.eclipse.jgit MANIFEST.MF
  TransportSftp: remove final modifiers from parameters
This commit is contained in:
David Pursehouse 2018-11-05 18:24:08 -05:00 committed by Gerrit Code Review @ Eclipse.org
parent 797a5b7a8f f8d2738ff4
commit 1cee6c7d51
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.eclipse.jgit/META-INF/MANIFEST.MF
View File

@ -62,6 +62,7 @@ Export-Package: org.eclipse.jgit.annotations;version="5.2.0",
org.eclipse.jgit.internal;version="5.2.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test",
org.eclipse.jgit.internal.fsck;version="5.2.0";x-friends:="org.eclipse.jgit.test",
org.eclipse.jgit.internal.ketch;version="5.2.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
org.eclipse.jgit.internal.revwalk;version="5.2.0";x-internal:=true,
org.eclipse.jgit.internal.storage.dfs;version="5.2.0";
x-friends:="org.eclipse.jgit.test,
org.eclipse.jgit.http.server,
@ -80,7 +81,8 @@ Export-Package: org.eclipse.jgit.annotations;version="5.2.0",
org.eclipse.jgit.internal.storage.reftable;version="5.2.0";
x-friends:="org.eclipse.jgit.http.test,org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
org.eclipse.jgit.internal.storage.reftree;version="5.2.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
org.eclipse.jgit.internal.transport.parser;version="5.2.0",
org.eclipse.jgit.internal.submodule;version="5.2.0";x-internal:=true,
org.eclipse.jgit.internal.transport.parser;version="5.2.0";x-friends:="org.eclipse.jgit.test",
org.eclipse.jgit.lib;version="5.2.0";
uses:="org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,

14
org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportSftp.java
View File

@ -323,9 +323,8 @@ void deleteFile(String path) throws IOException {
}
@Override
OutputStream writeFile(final String path,
final ProgressMonitor monitor, final String monitorTask)
throws IOException {
OutputStream writeFile(String path, ProgressMonitor monitor,
String monitorTask) throws IOException {
try {
return ftp.put(path);
} catch (SftpException je) {
@ -401,9 +400,8 @@ Map<String, Ref> readAdvertisedRefs() throws TransportException {
}
@SuppressWarnings("unchecked")
private void readLooseRefs(final TreeMap<String, Ref> avail,
final String dir, final String prefix)
throws TransportException {
private void readLooseRefs(TreeMap<String, Ref> avail, String dir,
String prefix) throws TransportException {
final Collection<ChannelSftp.LsEntry> list;
try {
list = ftp.ls(dir);
@ -426,8 +424,8 @@ private void readLooseRefs(final TreeMap<String, Ref> avail,
}
}
private Ref readRef(final TreeMap<String, Ref> avail,
final String path, final String name) throws TransportException {
private Ref readRef(TreeMap<String, Ref> avail, String path,
String name) throws TransportException {
final String line;
try (BufferedReader br = openReader(path)) {
line = br.readLine();