opendev/gerrit
Code Issues Proposed changes

Update JGit to 0.4.0-398-ge866578

Browse Source 
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2009-06-15 15:23:57 -07:00
parent cd4d4f0744
commit c450ab8f36
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -253,7 +253,7 @@ limitations under the License.
</licenses> </licenses>
<properties> <properties>
<jgitVersion>0.4.0-388-gd3d9379</jgitVersion> <jgitVersion>0.4.0-398-ge866578</jgitVersion>
<gwtormVersion>1.1.1</gwtormVersion> <gwtormVersion>1.1.1</gwtormVersion>
<gwtjsonrpcVersion>1.1.0</gwtjsonrpcVersion> <gwtjsonrpcVersion>1.1.0</gwtjsonrpcVersion>
<gwtexpuiVersion>1.1.1</gwtexpuiVersion> <gwtexpuiVersion>1.1.1</gwtexpuiVersion>

2
src/main/java/com/google/gerrit/server/patch/PatchFile.java
View File

@@ -51,7 +51,7 @@ public class PatchFile {
final RevWalk rw = new RevWalk(repo); final RevWalk rw = new RevWalk(repo);
final RevCommit bCommit = rw.parseCommit(ObjectId.fromString(id.get())); final RevCommit bCommit = rw.parseCommit(ObjectId.fromString(id.get()));
if (bCommit.getParentCount() > 0) { if (bCommit.getParentCount() > 0) {
rw.parse(bCommit.getParent(0)); rw.parseHeaders(bCommit.getParent(0));
aTree = bCommit.getParent(0).getTree(); aTree = bCommit.getParent(0).getTree();
} else { } else {
aTree = emptyTree(); aTree = emptyTree();

2
src/main/java/com/google/gerrit/server/ssh/AdminShowCaches.java
View File

@@ -67,7 +67,7 @@ class AdminShowCaches extends AbstractCommand {
final long mFree = r.freeMemory(); final long mFree = r.freeMemory();
final long mTotal = r.totalMemory(); final long mTotal = r.totalMemory();
final long mInuse = mTotal - mFree; final long mInuse = mTotal - mFree;
final int jgitBytes = WindowCacheStatAccessor.getOpenBytes(); final long jgitBytes = WindowCacheStatAccessor.getOpenBytes();
p.println("JGit Buffer Cache:"); p.println("JGit Buffer Cache:");
fItemCount("open files", WindowCacheStatAccessor.getOpenFiles()); fItemCount("open files", WindowCacheStatAccessor.getOpenFiles());

2
src/main/java/org/spearce/jgit/lib/WindowCacheStatAccessor.java
View File

@@ -22,7 +22,7 @@ public class WindowCacheStatAccessor {
return WindowCache.getInstance().getOpenFiles(); return WindowCache.getInstance().getOpenFiles();
} }
public static int getOpenBytes() { public static long getOpenBytes() {
return WindowCache.getInstance().getOpenBytes(); return WindowCache.getInstance().getOpenBytes();
} }