commit 1de243566ddcd13f49faf350f753b90b41de0056
author Shawn Pearce <sop@google.com> Thu Apr 25 14:01:04 2013 -0700
committer Shawn Pearce <sop@google.com> Fri Apr 26 07:33:44 2013 -0700
tree a1527700b0fa3ce4f9bcc7ca03ef5d16056c6127
parent 39f16cbea0af3554d48d85e62858785ba1ee60da

Sort library JARs by last modified time

Newer JARs should have more recent mtimes than older JARs that supply
the same classes. Try to favor the newer versions by sorting first
by mtime and then by name.

Bug: issue 1870
Change-Id: I783ab01c070914e02384413e0f5461a9c29a2a70

gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteLibraryBasedDataSourceProvider.java

diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteLibraryBasedDataSourceProvider.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteLibraryBasedDataSourceProvider.java
index 541fafd..6ab7395 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteLibraryBasedDataSourceProvider.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteLibraryBasedDataSourceProvider.java
@@ -14,6 +14,7 @@
 
 package com.google.gerrit.pgm.util;
 
+import com.google.common.primitives.Longs;
 import com.google.gerrit.server.config.GerritServerConfig;
 import com.google.gerrit.server.config.SitePaths;
 import com.google.gerrit.server.schema.DataSourceProvider;
@@ -66,6 +67,11 @@
       Arrays.sort(jars, new Comparator<File>() {
         @Override
         public int compare(File a, File b) {
+          // Sort by reverse last-modified time so newer JARs are first.
+          int cmp = Longs.compare(b.lastModified(), a.lastModified());
+          if (cmp != 0) {
+            return cmp;
+          }
           return a.getName().compareTo(b.getName());
         }
       });