Returned ImageLoader.stop()

Author: nostra13

library/src/com/nostra13/universalimageloader/core/ImageLoader.java

@@ -453,17 +453,21 @@ public void resume() {
 	}
 
 	/**
-	 * Clears current configuration. Stops all running display image tasks, discards all other scheduled tasks (true for
-	 * built-in task executors, false - for
-	 * {@linkplain ImageLoaderConfiguration.Builder#taskExecutor(java.util.concurrent.ExecutorService) custom task
-	 * executors}).<br />
-	 * <br />
+	 * Cancels all running and scheduled display image tasks.<br />
+	 * ImageLoader still can be used after calling this method.
+	 */
+	public void stop() {
+		engine.stop();
+	}
+
+	/**
+	 * {@linkplain #stop() Stops ImageLoader} and clears current configuration. <br />
 	 * You can {@linkplain #init(ImageLoaderConfiguration) init} ImageLoader with new configuration after calling this
 	 * method.
 	 */
 	public void destroy() {
 		if (configuration != null && configuration.loggingEnabled) L.d(LOG_DESTROY);
-		engine.destroy();
+		stop();
 		engine = null;
 		configuration = null;
 	}

library/src/com/nostra13/universalimageloader/core/ImageLoaderEngine.java

@@ -68,6 +68,7 @@ void submit(final LoadAndDisplayImageTask task) {
 			@Override
 			public void run() {
 				boolean isImageCachedOnDisc = configuration.discCache.get(task.getLoadingUri()).exists();
+				initExecutorsIfNeed();
 				if (isImageCachedOnDisc) {
 					taskExecutorForCachedImages.execute(task);
 				} else {
@@ -79,9 +80,23 @@ public void run() {
 
 	/** Submits task to execution pool */
 	void submit(ProcessAndDisplayImageTask task) {
+		initExecutorsIfNeed();
 		taskExecutorForCachedImages.execute(task);
 	}
 
+	private void initExecutorsIfNeed() {
+		if (taskExecutor == null) {
+			taskExecutor = createTaskExecutor();
+		}
+		if (taskExecutorForCachedImages == null) {
+			taskExecutorForCachedImages = createTaskExecutor();
+		}
+	}
+
+	private Executor createTaskExecutor() {
+		return DefaultConfigurationFactory.createExecutor(configuration.threadPoolSize, configuration.threadPriority, configuration.tasksProcessingType);
+	}
+
 	/** Returns URI of image which is loading at this moment into passed {@link ImageView} */
 	String getLoadingUriForView(ImageView imageView) {
 		return cacheKeysForImageViews.get(imageView.hashCode());
@@ -145,24 +160,17 @@ void resume() {
 		}
 	}
 
-	/** Stops all running display image tasks, discards all other scheduled tasks. Clears internal data. */
-	void destroy() {
+	/** Stops engine, cancels all running and scheduled display image tasks. Clears internal data. */
+	void stop() {
 		if (!configuration.customExecutor) {
-			((ExecutorService) taskExecutor).shutdownNow();
+			taskExecutor = null;
 		}
 		if (!configuration.customExecutorForCachedImages) {
-			((ExecutorService) taskExecutorForCachedImages).shutdownNow();
-		}
-		if (taskDistributor != null) {
-			taskDistributor.shutdownNow();
+			taskExecutorForCachedImages = null;
 		}
 
 		cacheKeysForImageViews.clear();
 		uriLocks.clear();
-		
-		taskExecutor = null;
-		taskExecutorForCachedImages = null;
-		taskDistributor = null;
 	}
 
 	ReentrantLock getLockForUri(String uri) {