Index: search/search-impl/impl/src/java/org/sakaiproject/search/indexer/impl/ConcurrentSearchIndexBuilderWorkerImpl.java
===================================================================
--- search/search-impl/impl/src/java/org/sakaiproject/search/indexer/impl/ConcurrentSearchIndexBuilderWorkerImpl.java	(revision 60864)
+++ search/search-impl/impl/src/java/org/sakaiproject/search/indexer/impl/ConcurrentSearchIndexBuilderWorkerImpl.java	(working copy)
@@ -36,7 +37,6 @@
 import org.sakaiproject.search.indexer.api.IndexWorkerDocumentListener;
 import org.sakaiproject.search.journal.api.ManagementOperation;
 import org.sakaiproject.search.journal.impl.JournalSettings;
-import org.sakaiproject.tool.api.Session;
 import org.sakaiproject.user.api.UserDirectoryService;
 
 /**
@@ -178,7 +178,6 @@
 		}
 
 		log.debug("Run Processing Thread");
-		boolean locked = false;
 
 		int totalDocs = searchService.getPendingDocs();
 
@@ -229,8 +228,7 @@
 		log.debug("Activity " + (lastIndexMetric > (10000L * loadFactor)) + " "
 				+ (lastIndexInterval > (60L * loadFactor)) + " " + createIndex);
 
-		if (lastIndexMetric > (10000L * loadFactor)
-				|| lastIndexInterval > (60L * loadFactor))
+		if (true)
 		{
 			log.debug("===" + process + "=============PROCESSING ");
 			if (process)
@@ -239,19 +237,24 @@
 				lastIndexRun = System.currentTimeMillis();
 
 				int batchSize = 100;
-				if (totalDocs > 500)
+				
+				if (totalDocs > 100000)
 				{
-					batchSize = 200;
+					batchSize = 10000;
 				}
+				else if (totalDocs > 10000)
+				{
+					batchSize = 1000;
+				}
 				else if (totalDocs > 1000)
 				{
 					batchSize = 500;
 				}
-				else if (totalDocs > 10000)
+				else if (totalDocs > 500)
 				{
-					batchSize = 1000;
+					batchSize = 200;
 				}
-				Session oldSession = null;
+					
 				securityService.pushAdvisor(new SecurityAdvisor() {
 
 					public SecurityAdvice isAllowed(String userId, String function, String reference)