summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.lfs.server
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2020-03-10 00:52:52 +0100
committerMatthias Sohn <matthias.sohn@sap.com>2020-03-10 00:52:52 +0100
commitcfc4f0114928803030e2655ff85aafa8ea1ac98d (patch)
tree163911765f44693c219e43bb2e2a52150de1b93b /org.eclipse.jgit.lfs.server
parentfb28427499584759a8d662e0c9e30a0e86338d70 (diff)
parent75ed8510f09f3f92373e49432a322400aa9c3e76 (diff)
downloadjgit-cfc4f0114928803030e2655ff85aafa8ea1ac98d.tar.gz
jgit-cfc4f0114928803030e2655ff85aafa8ea1ac98d.zip
Merge branch 'master' into next
* master: Prepare 5.7.1-SNAPSHOT builds Prepare 5.8.0-SNAPSHOT builds JGit v5.7.0.202003090808-r Silence API errors introduced by 093fbbd1 Bump Bazel version to 2.2.0 Add validation to hex decoder Expose FileStoreAttributes.setBackground() Update reftable storage repo layout Add 4.14 and 4.15-staging target platforms Update Orbit to R20200224183213 for final 2020-03 Update Orbit to S20200224183213 for 2020-03 RC1 Cygwin expects forward slashes for commands to be run via sh.exe [releng] Update year in copyright notices for features Using for-each loop in jdt Make Logger instances final Move array designators from the variable to the type ObjectWalk: Add null check before skip tree. Revert "RevWalk: stop mixing lines of history in topo sort" Do not fail if known hosts file does not contain valid host key Prepare 5.7.0-SNAPSHOT builds JGit v5.7.0.202002241735-m3 Update Orbit to S20200219023850 for 2012-03 M3 Change-Id: I6a219888699ebf6d768f2b8fe33a6d2ca9d4c392 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.lfs.server')
-rw-r--r--org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/LfsProtocolServlet.java2
-rw-r--r--org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java2
-rw-r--r--org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/LfsProtocolServlet.java b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/LfsProtocolServlet.java
index eeacbc2f0d..3ec08ecc83 100644
--- a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/LfsProtocolServlet.java
+++ b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/LfsProtocolServlet.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* @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;
diff --git a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java
index 28f3d94c9b..cc57947a79 100644
--- a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java
+++ b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java
@@ -34,7 +34,7 @@ import org.eclipse.jgit.util.HttpSupport;
*/
public class ObjectDownloadListener implements WriteListener {
- private static Logger LOG = Logger
+ private static final Logger LOG = Logger
.getLogger(ObjectDownloadListener.class.getName());
private final AsyncContext context;
diff --git a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java
index 95f941946c..f5212fe259 100644
--- a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java
+++ b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java
@@ -38,7 +38,7 @@ import org.eclipse.jgit.lfs.lib.Constants;
*/
public class ObjectUploadListener implements ReadListener {
- private static Logger LOG = Logger
+ private static final Logger LOG = Logger
.getLogger(ObjectUploadListener.class.getName());
private final AsyncContext context;