commit 318cc182b2335ccd0e15f55c94679c2176a6efdb
author Edwin Kempin <ekempin@google.com> Tue Aug 16 13:48:36 2016 +0200
committer Edwin Kempin <ekempin@google.com> Tue Aug 16 13:49:39 2016 +0200
tree 8f18447688121a7377ba9e0a5e207265eb71d2d5
parent 90d216a9f65681e4a3602b11f86ca25b4596f255
parent d6e8be86ffcdef572e882660cb61506ee58ef2d3

Merge branch 'stable-2.12'

* stable-2.12:
  xdocs: Fix a race condition in generating the temporary file name

Change-Id: Id20a678f7216cb42f9e173f2af759c41cdfc98f0

lib/gerrit/BUCK

diff --git a/lib/gerrit/BUCK b/lib/gerrit/BUCK
index f1ab768..7571746 100644
--- a/lib/gerrit/BUCK
+++ b/lib/gerrit/BUCK
@@ -1,12 +1,11 @@
 include_defs('//bucklets/maven_jar.bucklet')
 
-VER = '2.12'
-REPO = MAVEN_CENTRAL
+VER = '2.13-SNAPSHOT'
+REPO = MAVEN_LOCAL
 
 maven_jar(
   name = 'plugin-api',
   id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  sha1 = '8ce1f6e65078bbcf03a1758f96b3ebca19b7fe3c',
   attach_source = False,
   repository = REPO,
   license = 'Apache2.0',
@@ -15,7 +14,6 @@
 maven_jar(
   name = 'gwtui-api',
   id = 'com.google.gerrit:gerrit-plugin-gwtui:' + VER,
-  sha1 = 'a7e7d82746b847678022242ec9eb44d1f16e8639',
   attach_source = False,
   repository = REPO,
   license = 'Apache2.0',

src/main/java/com/googlesource/gerrit/plugins/xdocs/Module.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/xdocs/Module.java b/src/main/java/com/googlesource/gerrit/plugins/xdocs/Module.java
index b90db61..ee029e3 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/xdocs/Module.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/xdocs/Module.java
@@ -18,6 +18,7 @@
 import com.google.gerrit.extensions.annotations.Exports;
 import com.google.gerrit.extensions.annotations.PluginName;
 import com.google.gerrit.extensions.client.GerritTopMenu;
+import com.google.gerrit.extensions.client.MenuItem;
 import com.google.gerrit.extensions.config.FactoryModule;
 import com.google.gerrit.extensions.registration.DynamicMap;
 import com.google.gerrit.extensions.registration.DynamicSet;

src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocServlet.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocServlet.java b/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocServlet.java
index ebae46c..89df7a0 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocServlet.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocServlet.java
@@ -334,7 +334,7 @@
       throws ResourceNotFoundException, IOException {
     try (RevWalk rw = new RevWalk(repo)) {
       RevCommit commit = rw.parseCommit(revId);
-      if (!projectControl.canReadCommit(db.get(), rw, commit)) {
+      if (!projectControl.canReadCommit(db.get(), repo, commit)) {
         throw new ResourceNotFoundException();
       }
     }