Author: cstamas
Date: Tue Dec 28 17:08:23 2010
New Revision: 1053391
URL: http://svn.apache.org/viewvc?rev=1053391&view=rev
Log:
Making Indexer CLI simpler, by not using async-commit feature since it is
CLI/batch invocation, and no need for that anyway.
Modified:
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
Modified:
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
URL:
http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java?rev=1053391&r1=1053390&r2=1053391&view=diff
==============================================================================
---
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
(original)
+++
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
Tue Dec 28 17:08:23 2010
@@ -38,6 +38,7 @@ import org.apache.maven.index.ArtifactIn
import org.apache.maven.index.ArtifactScanningListener;
import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.ScanningResult;
+import org.apache.maven.index.context.DefaultIndexingContext;
import org.apache.maven.index.context.IndexCreator;
import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.index.context.UnsupportedExistingLuceneIndexException;
@@ -341,6 +342,10 @@ public class NexusIndexerCli
NexusIndexer indexer = plexus.lookup( NexusIndexer.class );
IndexingContext context = null;
+
+ // this is a CLI/batch invocation, don't coggle it with threads
+ DefaultIndexingContext.BLOCKING_COMMIT = true;
+
try
{
Modified:
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
URL:
http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java?rev=1053391&r1=1053390&r2=1053391&view=diff
==============================================================================
---
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
(original)
+++
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
Tue Dec 28 17:08:23 2010
@@ -1159,6 +1159,11 @@ public class DefaultIndexingContext
protected void installBottleWarmer()
{
+ if ( BLOCKING_COMMIT )
+ {
+ return;
+ }
+
Runnable bottleWarmer = new Runnable()
{
public void run()
