opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.8'

Browse Source 
* stable-2.8:
  Stop packaging joda time in root of gerrit.war
  Add release notes for Gerrit 2.8.2
  Pass recursive=true into config.getNames() JGit method
  Bump JGit version to 3.2.0.201312181205-r
  Update replication plugin to latest revision
This commit is contained in:
Shawn Pearce
2014-02-04 14:10:20 -08:00
parent 6a06f1596b a2a067df82
commit 8242630d35
6 changed files with 145 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-launcher/src/main/java/com/google/gerrit/launcher/GerritLauncher.java
View File

@@ -17,8 +17,6 @@ package com.google.gerrit.launcher;
import static java.util.concurrent.TimeUnit.DAYS;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import org.joda.time.DateTimeUtils;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
@@ -489,7 +487,7 @@ public final class GerritLauncher {
//
final File[] tmpEntries = tmp.listFiles();
if (tmpEntries != null) {
final long now = DateTimeUtils.currentTimeMillis();
final long now = System.currentTimeMillis();
final long expired = now - MILLISECONDS.convert(7, DAYS);
for (final File tmpEntry : tmpEntries) {
if (tmpEntry.isDirectory() && tmpEntry.lastModified() < expired) {