From: Jacek Centkowski <geminica.programs@gmail.com>
Date: Thu, 24 Nov 2016 10:32:48 +0000 (+0100)
Subject: Use the same variable to check and extract LFS object id
X-Git-Tag: v4.6.0.201612231935-r~21^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F71%2F85671%2F1;p=jgit.git

Use the same variable to check and extract LFS object id

It is easier to maintain when the same variable is used for both check
and extraction of LFS object id.

Change-Id: I5406f9bc4a085aa164c4565a9667ad2925105190
Signed-off-by: Jacek Centkowski <geminica.programs@gmail.com>
---

diff --git a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/FileLfsServlet.java b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/FileLfsServlet.java
index 39aaa91d04..2ecba6d029 100644
--- a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/FileLfsServlet.java
+++ b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/FileLfsServlet.java
@@ -128,13 +128,14 @@ public class FileLfsServlet extends HttpServlet {
 	private AnyLongObjectId getObjectToTransfer(HttpServletRequest req,
 			HttpServletResponse rsp) throws IOException {
 		String info = req.getPathInfo();
-		if (info.length() != 1 + Constants.LONG_OBJECT_ID_STRING_LENGTH) {
+		int length = 1 + Constants.LONG_OBJECT_ID_STRING_LENGTH;
+		if (info.length() != length) {
 			sendError(rsp, HttpStatus.SC_UNPROCESSABLE_ENTITY, MessageFormat
 					.format(LfsServerText.get().invalidPathInfo, info));
 			return null;
 		}
 		try {
-			return LongObjectId.fromString(info.substring(1, 65));
+			return LongObjectId.fromString(info.substring(1, length));
 		} catch (InvalidLongObjectIdException e) {
 			sendError(rsp, HttpStatus.SC_UNPROCESSABLE_ENTITY, e.getMessage());
 			return null;