motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge branch 'stable-5.6' 

* stable-5.6:
  Cygwin expects forward slashes for commands to be run via sh.exe
  Make Logger instances final
  Move array designators from the variable to the type

Change-Id: I9a5dc570deb478525bf48ef526d8cba5b19418bf
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Matthias Sohn 2020-02-28 23:53:17 +01:00
parent 8244aa5faf 6f268f8ceb
commit 2161c1e5e4
18 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/RegexPipeline.java
View File

@ -105,7 +105,7 @@ void service(HttpServletRequest req, HttpServletResponse rsp)
// build a request for them so RegexGroupFilter can pick
// a different capture group later. Continue using the
// first capture group as the path info.
WrappedRequest groups[] = new WrappedRequest[cur.groupCount()];
WrappedRequest[] groups = new WrappedRequest[cur.groupCount()];
for (int groupId = 1; groupId <= cur.groupCount(); groupId++) {
final int s = cur.start(groupId);
final String path, info;

2
org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepeatRule.java
View File

@ -45,7 +45,7 @@
*/
public class RepeatRule implements TestRule {
private static Logger LOG = Logger
private static final Logger LOG = Logger
.getLogger(RepeatRule.class.getName());
/**

2
org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/LfsProtocolServlet.java
View File

@ -60,7 +60,7 @@
* @since 4.3
*/
public abstract class LfsProtocolServlet extends HttpServlet {
private static Logger LOG = LoggerFactory
private static final Logger LOG = LoggerFactory
.getLogger(LfsProtocolServlet.class);
private static final long serialVersionUID = 1L;

2
org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java
View File

@ -34,7 +34,7 @@
*/
public class ObjectDownloadListener implements WriteListener {
private static Logger LOG = Logger
private static final Logger LOG = Logger
.getLogger(ObjectDownloadListener.class.getName());
private final AsyncContext context;

2
org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java
View File

@ -38,7 +38,7 @@
*/
public class ObjectUploadListener implements ReadListener {
private static Logger LOG = Logger
private static final Logger LOG = Logger
.getLogger(ObjectUploadListener.class.getName());
private final AsyncContext context;

2
org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/CachingKeyPairProvider.java
View File

@ -88,7 +88,7 @@ private KeyPair loadKey(SessionContext session, Path path)
if (cache == null) {
return loadKey(session, resource, path, getPasswordFinder());
}
Throwable t[] = { null };
Throwable[] t = { null };
KeyPair key = cache.get(path, p -> {
try {
return loadKey(session, resource, p, getPasswordFinder());

2
org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/proxy/HttpParser.java
View File

@ -216,7 +216,7 @@ private static int parseChallenge(AuthenticationChallenge challenge,
start = nextStart + 1;
} else {
if (header.charAt(nextStart) == '"') {
int nextEnd[] = { nextStart + 1 };
int[] nextEnd = { nextStart + 1 };
String value = scanQuotedString(header, nextStart + 1,
nextEnd);
challenge.addArgument(header.substring(start, end), value);

2
org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java
View File

@ -415,7 +415,7 @@ public static RawText load(ObjectLoader ldr, int threshold)
}
}
byte data[];
byte[] data;
try {
data = new byte[(int)sz];
} catch (OutOfMemoryError e) {

3
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
View File

@ -79,7 +79,8 @@
* This class handles checking out one or two trees merging with the index.
*/
public class DirCacheCheckout {
private static Logger LOG = LoggerFactory.getLogger(DirCacheCheckout.class);
private static final Logger LOG = LoggerFactory
.getLogger(DirCacheCheckout.class);
private static final int MAX_EXCEPTION_TEXT_SIZE = 10 * 1024;

4
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableStack.java
View File

@ -649,7 +649,7 @@ public String toString() {
}
}
static List<Segment> segmentSizes(long sizes[]) {
static List<Segment> segmentSizes(long[] sizes) {
List<Segment> segments = new ArrayList<>();
Segment cur = new Segment();
for (int i = 0; i < sizes.length; i++) {
@ -669,7 +669,7 @@ static List<Segment> segmentSizes(long sizes[]) {
return segments;
}
private static Optional<Segment> autoCompactCandidate(long sizes[]) {
private static Optional<Segment> autoCompactCandidate(long[] sizes) {
if (sizes.length == 0) {
return Optional.empty();
}

4
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java
View File

@ -191,7 +191,7 @@ public static Iterable<PackWriter> getInstances() {
}
@SuppressWarnings("unchecked")
BlockList<ObjectToPack> objectsLists[] = new BlockList[OBJ_TAG + 1];
BlockList<ObjectToPack>[] objectsLists = new BlockList[OBJ_TAG + 1];
{
objectsLists[OBJ_COMMIT] = new BlockList<>();
objectsLists[OBJ_TREE] = new BlockList<>();
@ -236,7 +236,7 @@ public static Iterable<PackWriter> getInstances() {
private List<ObjectToPack> sortedByName;
private byte packcsum[];
private byte[] packcsum;
private boolean deltaBaseAsOffset;

2
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
View File

@ -110,7 +110,7 @@ public enum MergeFailureReason {
*
* @since 3.0
*/
protected String commitNames[];
protected String[] commitNames;
/**
* Index of the base tree within the {@link #tw tree walk}.

4
org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
View File

@ -2378,12 +2378,12 @@ public void write(int b) throws IOException {
}
@Override
public void write(byte b[]) throws IOException {
public void write(byte[] b) throws IOException {
out.write(b);
}
@Override
public void write(byte b[], int off, int len) throws IOException {
public void write(byte[] b, int off, int len) throws IOException {
out.write(b, off, len);
}

2
org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
View File

@ -2270,7 +2270,7 @@ public void run() {
void copy() throws IOException {
boolean writeFailure = false;
byte buffer[] = new byte[4096];
byte[] buffer = new byte[4096];
int readBytes;
while ((readBytes = in.read(buffer)) != -1) {
// Do not try to write again after a failure, but keep

2
org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32_Cygwin.java
View File

@ -117,7 +117,7 @@ public ProcessBuilder runInShell(String cmd, String[] args) {
argv.add("sh.exe"); //$NON-NLS-1$
argv.add("-c"); //$NON-NLS-1$
argv.add("$0 \"$@\""); //$NON-NLS-1$
argv.add(cmd);
argv.add(cmd.replace(File.separatorChar, '/'));
argv.addAll(Arrays.asList(args));
ProcessBuilder proc = new ProcessBuilder();
proc.command(argv);

2
org.eclipse.jgit/src/org/eclipse/jgit/util/LfsFactory.java
View File

@ -280,7 +280,7 @@ public int read() throws IOException {
}
@Override
public int read(byte b[], int off, int len) throws IOException {
public int read(byte[] b, int off, int len) throws IOException {
return stream.read(b, off, len);
}

2
org.eclipse.jgit/src/org/eclipse/jgit/util/Monitoring.java
View File

@ -49,7 +49,7 @@ public class Monitoring {
String metricName) {
boolean register = false;
try {
Class<?> interfaces[] = mbean.getClass().getInterfaces();
Class<?>[] interfaces = mbean.getClass().getInterfaces();
for (Class<?> i : interfaces) {
register = SystemReader.getInstance().getUserConfig()
.getBoolean(

2
org.eclipse.jgit/src/org/eclipse/jgit/util/sha1/SHA1.java
View File

@ -45,7 +45,7 @@
* @since 4.7
*/
public class SHA1 {
private static Logger LOG = LoggerFactory.getLogger(SHA1.class);
private static final Logger LOG = LoggerFactory.getLogger(SHA1.class);
private static final boolean DETECT_COLLISIONS;
static {