opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.11'

Browse Source 
* stable-2.11:
  Position cursor on first column on diff chunk navigation
  Restore default Codemirror cursor style
  Update 2.11.1 release notes
  Update replication plugin
  rest-api-changes.txt: fix minor spelling mistake
  Fix various spelling mistakes
  Prolog-Cookbook: tidy up rule status descriptions
  Upgrade replication plugin
  Always add SecureStore module in WebAppInitializer
  Batch index executor: Don't fall back to interactive executor
  Fix minor typo in set-account command documentation
  ChangeJson: Don't load all approvals on closed changes
  ChangeJson: Less eager loading of patch sets
  ChangeJson: Eliminate patch set loading in search results
  Remove StoredValues.PATCH_SET
  Update 2.11.1 release notes
  JarPluginProvider: Add JarScanner on running plugin JAR file
  GitWeb config: Delete temporary config on exit
  Fix description of auth.* parameters

Change-Id: I9fc13aa3665c29e488d49a36c9b57f908a74c2f8
This commit is contained in:
David Pursehouse
2015-05-19 17:48:18 +09:00
parent 65202de88c 5ac80fd937
commit be0877d2bd
22 changed files with 99 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-server/src/main/java/com/google/gerrit/server/index/IndexModule.java
View File

@@ -114,7 +114,6 @@ public class IndexModule extends LifecycleModule {
@Singleton
@IndexExecutor(BATCH)
ListeningExecutorService getBatchIndexExecutor(
@IndexExecutor(INTERACTIVE) ListeningExecutorService interactive,
@GerritServerConfig Config config,
WorkQueue workQueue) {
if (batchExecutor != null) {
@@ -125,7 +124,7 @@ public class IndexModule extends LifecycleModule {
threads = config.getInt("changeMerge", null, "threadPoolSize", 0);
}
if (threads <= 0) {
return interactive;
threads = Runtime.getRuntime().availableProcessors();
}
return MoreExecutors.listeningDecorator(
workQueue.createQueue(threads, "Index-Batch"));

2
gerrit-server/src/main/java/com/google/gerrit/server/plugins/JarPluginProvider.java
View File

@@ -142,7 +142,7 @@ public class JarPluginProvider implements ServerPluginProvider {
new URLClassLoader(urls.toArray(new URL[urls.size()]),
PluginLoader.parentFor(type));
JarScanner jarScanner = createJarScanner(srcJar);
JarScanner jarScanner = createJarScanner(tmp);
ServerPlugin plugin = new ServerPlugin(name, description.canonicalUrl,
description.user, srcJar, snapshot, jarScanner,
description.dataDir, pluginLoader);

2
gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCache.java
View File

@@ -32,7 +32,7 @@ public interface ProjectCache {
* Get the cached data for a project by its unique name.
*
* @param projectName name of the project.
* @return the cached data; null if no such project exists or a error occured.
* @return the cached data; null if no such project exists or a error occurred.
* @see #checkedGet(com.google.gerrit.reviewdb.client.Project.NameKey)
*/
public ProjectState get(Project.NameKey projectName);