motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge branch 'stable-4.5' 

* stable-4.5:
  Use the same variable to check and extract LFS object id

Change-Id: I314bd4373f40843c68853b3999f60d85e08628d9
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
David Pursehouse 2016-12-06 16:55:16 +09:00
parent 196a773e23 8f60297861
commit c62933bf59
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/FileLfsServlet.java
View File

@ -128,13 +128,14 @@ protected void doGet(HttpServletRequest req,
private AnyLongObjectId getObjectToTransfer(HttpServletRequest req, private AnyLongObjectId getObjectToTransfer(HttpServletRequest req,
HttpServletResponse rsp) throws IOException { HttpServletResponse rsp) throws IOException {
String info = req.getPathInfo(); 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 sendError(rsp, HttpStatus.SC_UNPROCESSABLE_ENTITY, MessageFormat
.format(LfsServerText.get().invalidPathInfo, info)); .format(LfsServerText.get().invalidPathInfo, info));
return null; return null;
} }
try { try {
return LongObjectId.fromString(info.substring(1, 65)); return LongObjectId.fromString(info.substring(1, length));
} catch (InvalidLongObjectIdException e) { } catch (InvalidLongObjectIdException e) {
sendError(rsp, HttpStatus.SC_UNPROCESSABLE_ENTITY, e.getMessage()); sendError(rsp, HttpStatus.SC_UNPROCESSABLE_ENTITY, e.getMessage());
return null; return null;