Merge "Permit cache.diff.intraline to disable MyersDiff"
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/UserPassAuthServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/UserPassAuthServiceImpl.java
index 161d867..08fcaa8 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/UserPassAuthServiceImpl.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/UserPassAuthServiceImpl.java
@@ -37,16 +37,18 @@
}
@Override
- public void authenticate(final String username, final String password,
+ public void authenticate(String username, final String password,
final AsyncCallback<LoginResult> callback) {
LoginResult result = new LoginResult();
- if (username == null || "".equals(username) //
+ if (username == null || "".equals(username.trim()) //
|| password == null || "".equals(password)) {
result.success = false;
callback.onSuccess(result);
return;
}
+ username = username.trim();
+
final AuthRequest req = AuthRequest.forUser(username);
req.setPassword(password);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java
index ead6a6f..567bd33 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java
@@ -181,20 +181,6 @@
throw new UnsupportedOperationException("Callable not implemented");
}
- @SuppressWarnings("unchecked")
- @Override
- protected void afterExecute(Runnable r, Throwable t) {
- if (r instanceof Task) {
- final Task<?> task = (Task<?>) r;
- if (!task.isPeriodic()) {
- remove(task);
- }
- } else {
- log.error("Non task object in queue: " + r.getClass() + ": " + r);
- }
- super.afterExecute(r, t);
- }
-
void remove(final Task<?> task) {
all.remove(task.getTaskId(), task);
}
@@ -330,6 +316,8 @@
} finally {
if (isPeriodic()) {
running.set(false);
+ } else {
+ executor.remove(this);
}
}
}
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/util/SocketUtilTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/util/SocketUtilTest.java
index 2ed0e18..e6aecc8 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/util/SocketUtilTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/util/SocketUtilTest.java
@@ -116,13 +116,5 @@
resolve("[localhost]:1234", 80));
assertEquals(new InetSocketAddress(getByName("localhost"), 80), //
resolve("[localhost]", 80));
-
- String badname = "this-name-is-not-supposed-to-resolve-on-your-network";
- try {
- resolve(badname + ":12", 80);
- fail("did not throw exception");
- } catch (IllegalArgumentException e) {
- assertEquals("unknown host: " + badname + ":12", e.getMessage());
- }
}
}
