Merge branch 'stable-3.11'

* stable-3.11:
  Point to correct JGit API docs version
  Audit: fetch current user and sessionId at the beginning of the REST API

Release-Notes: skip
Change-Id: I6d70a0f3bb837330b944dd6143ecbed0e1041ff9

java/com/google/gerrit/extensions/BUILD

diff --git a/java/com/google/gerrit/extensions/BUILD b/java/com/google/gerrit/extensions/BUILD
index f36018b..762df80 100644
--- a/java/com/google/gerrit/extensions/BUILD
+++ b/java/com/google/gerrit/extensions/BUILD
@@ -2,9 +2,9 @@
 load("//tools:nongoogle.bzl", "GUAVA_DOC_URL")
 load("//tools/bzl:javadoc.bzl", "java_doc")
 
-_DOC_VERS = "5.5.0.201909110433-r"
+_DOC_VERS = "6.1.0.202203080745-r"
 
-JGIT_DOC_URL = "https://download.eclipse.org/jgit/site/" + _DOC_VERS + "/apidocs"
+JGIT_DOC_URL = "https://archive.eclipse.org/jgit/site/" + _DOC_VERS + "/apidocs"
 
 java_binary(
     name = "extension-api",

java/com/google/gerrit/httpd/restapi/RestApiServlet.java

diff --git a/java/com/google/gerrit/httpd/restapi/RestApiServlet.java b/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
index 970be10..d7ec2ad 100644
--- a/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
+++ b/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
@@ -328,6 +328,8 @@
     Object inputRequestBody = null;
     RestResource rsrc = TopLevelResource.INSTANCE;
     ViewData viewData = null;
+    String sessionId = globals.webSession.get().getSessionId();
+    CurrentUser currentUser = globals.currentUser.get();
 
     try (TraceContext traceContext = enableTracing(req, res)) {
       String requestUri = requestUri(req);
@@ -768,8 +770,8 @@
             metric, System.nanoTime() - startNanos, TimeUnit.NANOSECONDS);
         globals.auditService.dispatch(
             new ExtendedHttpAuditEvent(
-                globals.webSession.get().getSessionId(),
-                globals.currentUser.get(),
+                sessionId,
+                currentUser,
                 req,
                 auditStartTs,
                 qp != null ? qp.params() : ImmutableListMultimap.of(),