From e7e8bd8af341719b7cb902c7861ea198f5db43a6 Mon Sep 17 00:00:00 2001
From: Robbert Noordzij <robbert@xseeding.nl>
Date: Tue, 07 Oct 2014 06:14:27 -0400
Subject: [PATCH] Bug in the rawservlet in extracting the repository out of the path. The offset for finding the next slash should be the current slash + 1, not the last offset + the offset of the current slash.
---
src/test/java/com/gitblit/tests/JGitUtilsTest.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/JGitUtilsTest.java b/src/test/java/com/gitblit/tests/JGitUtilsTest.java
index 05bea91..68cb4f8 100644
--- a/src/test/java/com/gitblit/tests/JGitUtilsTest.java
+++ b/src/test/java/com/gitblit/tests/JGitUtilsTest.java
@@ -420,6 +420,11 @@
String contentA = JGitUtils.getStringContent(repository, (RevTree) null, "java.java");
RevCommit commit = JGitUtils.getCommit(repository, Constants.HEAD);
String contentB = JGitUtils.getStringContent(repository, commit.getTree(), "java.java");
+
+ assertTrue("ContentA is null!", contentA != null && contentA.length() > 0);
+ assertTrue("ContentB is null!", contentB != null && contentB.length() > 0);
+ assertTrue(contentA.equals(contentB));
+
String contentC = JGitUtils.getStringContent(repository, commit.getTree(), "missing.txt");
// manually construct a blob, calculate the hash, lookup the hash in git
@@ -429,9 +434,6 @@
String sha1 = StringUtils.getSHA1(sb.toString());
String contentD = JGitUtils.getStringContent(repository, sha1);
repository.close();
- assertTrue("ContentA is null!", contentA != null && contentA.length() > 0);
- assertTrue("ContentB is null!", contentB != null && contentB.length() > 0);
- assertTrue(contentA.equals(contentB));
assertNull(contentC);
assertTrue(contentA.equals(contentD));
}
--
Gitblit v1.9.1