Merge "Distinguish between error and timeout in intraline diff error message" into stable-2.6
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java
index f6cd8c1..adca95e 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java
@@ -119,14 +119,17 @@
WebSession session = sessionProvider.get();
if (session.isSignedIn()) {
String user = getRemoteUser(req);
- AccountExternalId.Key id = session.getLastLoginExternalId();
- return user != null
- && id != null
- && id.equals(new AccountExternalId.Key(SCHEME_GERRIT, user));
+ return user == null || correctUser(user, session);
}
return false;
}
+ private static boolean correctUser(String user, WebSession session) {
+ AccountExternalId.Key id = session.getLastLoginExternalId();
+ return id != null
+ && id.equals(new AccountExternalId.Key(SCHEME_GERRIT, user));
+ }
+
String getRemoteUser(HttpServletRequest req) {
if (AUTHORIZATION.equals(loginHeader)) {
String user = emptyToNull(req.getRemoteUser());
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java
index f832c8a..b07f28c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java
@@ -50,7 +50,6 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
-import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -95,7 +94,7 @@
disabled = Maps.newConcurrentMap();
broken = Maps.newHashMap();
toCleanup = Queues.newArrayDeque();
- cleanupHandles = new Hashtable<Plugin,CleanupHandle>();
+ cleanupHandles = Maps.newConcurrentMap();
cleaner = pct;
long checkFrequency = ConfigUtil.getTimeUnit(cfg,
