commit 6a5f76e1e655e23e2207b2a9899f95bb588ca183
author Shawn Pearce <sop@google.com> Wed Sep 23 19:03:05 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 23 19:03:05 2015 +0000
tree d08dc9b23cf12ad4ea4507462bbc38691306f9e2
parent 04faeaa0abc331231c01fd389655c5c0d430c06c
parent ec622bf71a642c08a0c518d7de90bd823787735a

Merge "Redirect CatServlet requests to DownloadContent"

BUCK

diff --git a/BUCK b/BUCK
index 4dd69c3..a73d347 100644
--- a/BUCK
+++ b/BUCK
@@ -22,11 +22,9 @@
 
 genrule(
   name = 'api',
-  cmd = ';'.join(
-    ['cd $TMP'] +
-    ['ln -s $(location %s) .' % n for n in API_DEPS] +
-    ['zip -q0 $OUT *']),
-  out = 'api.zip',
+  cmd = 'echo done >$OUT',
+  deps = API_DEPS,
+  out = '__fake.api__',
 )
 
 genrule(

gerrit-plugin-api/BUCK

diff --git a/gerrit-plugin-api/BUCK b/gerrit-plugin-api/BUCK
index ed11e0f..59c7801 100644
--- a/gerrit-plugin-api/BUCK
+++ b/gerrit-plugin-api/BUCK
@@ -34,6 +34,7 @@
     '//lib:jsch',
     '//lib:mime-util',
     '//lib:servlet-api-3_1',
+    '//lib:velocity',
     '//lib/commons:lang',
     '//lib/guice:guice',
     '//lib/guice:guice-assistedinject',

gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java b/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java
index baba4bb..885a97f 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java
@@ -39,7 +39,6 @@
 import com.google.gerrit.server.config.DisableReverseDnsLookup;
 import com.google.gerrit.server.group.SystemGroupBackend;
 import com.google.gwtorm.server.OrmException;
-import com.google.gwtorm.server.OrmRuntimeException;
 import com.google.gwtorm.server.ResultSet;
 import com.google.inject.Inject;
 import com.google.inject.OutOfScopeException;
@@ -334,8 +333,11 @@
       try {
         starredChanges = starredChangeIds(
             starredQuery != null ? starredQuery : starredQuery());
-      } catch (OrmException | OrmRuntimeException e) {
+      } catch (OrmException | RuntimeException e) {
         log.warn("Cannot query starred changes", e);
+        starredChanges = Collections.emptySet();
+      } finally {
+        starredQuery = null;
       }
     }
     return starredChanges;

gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
index acdf004..1c19bf5 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
@@ -294,7 +294,7 @@
     Map<Change.Id, ChangeInfo> out = Maps.newHashMap();
     for (QueryResult r : in) {
       List<ChangeInfo> infos = toChangeInfo(out, r.changes());
-      if (r.moreChanges()) {
+      if (!infos.isEmpty() && r.moreChanges()) {
         infos.get(infos.size() - 1)._moreChanges = true;
       }
       res.add(infos);