Merge "Bump guava version to 18.0"
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/RebuildNotedb.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/RebuildNotedb.java
index 21b7132..ea7475c 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/RebuildNotedb.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/RebuildNotedb.java
@@ -130,7 +130,7 @@
futures.add(future);
future.addListener(
new RebuildListener(c.getId(), future, ok, doneTask, failedTask),
- MoreExecutors.sameThreadExecutor());
+ MoreExecutors.directExecutor());
}
mpm.waitFor(Futures.transform(Futures.successfulAsList(futures),
@@ -212,7 +212,7 @@
dbInjector.getInstance(WorkQueue.class)
.createQueue(threads, "RebuildChange"));
} else {
- return MoreExecutors.sameThreadExecutor();
+ return MoreExecutors.newDirectExecutorService();
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommitsExecutorModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommitsExecutorModule.java
index 81ce05d..25fbfb9 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommitsExecutorModule.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommitsExecutorModule.java
@@ -60,7 +60,7 @@
public ListeningExecutorService createChangeUpdateExecutor(@GerritServerConfig Config config) {
int poolSize = config.getInt("receive", null, "changeUpdateThreads", 1);
if (poolSize <= 1) {
- return MoreExecutors.sameThreadExecutor();
+ return MoreExecutors.newDirectExecutorService();
}
return MoreExecutors.listeningDecorator(
MoreExecutors.getExitingExecutorService(
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeBatchIndexer.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeBatchIndexer.java
index a82527f..9a992cf 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeBatchIndexer.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeBatchIndexer.java
@@ -195,7 +195,7 @@
fail(project, e);
throw e;
}
- }, MoreExecutors.sameThreadExecutor());
+ }, MoreExecutors.directExecutor());
}
try {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexModule.java
index 67d0fef..3aeeef2 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexModule.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexModule.java
@@ -106,7 +106,7 @@
threads = config.getInt("index", null, "threads", 0);
}
if (threads <= 0) {
- return MoreExecutors.sameThreadExecutor();
+ return MoreExecutors.newDirectExecutorService();
}
return MoreExecutors.listeningDecorator(
workQueue.createQueue(threads, "index"));
diff --git a/lib/BUCK b/lib/BUCK
index 3973463..fa7d0cf 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -51,8 +51,8 @@
maven_jar(
name = 'guava',
- id = 'com.google.guava:guava:17.0',
- sha1 = '9c6ef172e8de35fd8d4d8783e4821e57cdef7445',
+ id = 'com.google.guava:guava:18.0',
+ sha1 = 'cce0823396aa693798f8882e64213b1772032b09',
license = 'Apache2.0',
)
