Author: rfrovarp
Date: Tue Nov 15 16:41:22 2011
New Revision: 1202294
URL: http://svn.apache.org/viewvc?rev=1202294&view=rev
Log:
Merge changes over from trunk
Modified:
incubator/droids/branches/0.1.x/droids-core/src/main/java/org/apache/droids/impl/MultiThreadedTaskMaster.java
(contents, props changed)
Modified:
incubator/droids/branches/0.1.x/droids-core/src/main/java/org/apache/droids/impl/MultiThreadedTaskMaster.java
URL:
http://svn.apache.org/viewvc/incubator/droids/branches/0.1.x/droids-core/src/main/java/org/apache/droids/impl/MultiThreadedTaskMaster.java?rev=1202294&r1=1202293&r2=1202294&view=diff
==============================================================================
---
incubator/droids/branches/0.1.x/droids-core/src/main/java/org/apache/droids/impl/MultiThreadedTaskMaster.java
(original)
+++
incubator/droids/branches/0.1.x/droids-core/src/main/java/org/apache/droids/impl/MultiThreadedTaskMaster.java
Tue Nov 15 16:41:22 2011
@@ -96,6 +96,7 @@ public class MultiThreadedTaskMaster<T e
if (pool == null) {
this.pool = new TaskExecutorPool();
+ this.pool.setCorePoolSize(this.poolSize);
}
for (int i = 0; i < poolSize; i++) {
@@ -241,7 +242,9 @@ public class MultiThreadedTaskMaster<T e
*/
public void setPoolSize(int poolSize)
{
- pool.setCorePoolSize(this.poolSize = poolSize);
+ this.poolSize = poolSize;
+ if(pool != null)
+ pool.setCorePoolSize(this.poolSize);
}
private class TaskExecutorPool extends ThreadPoolExecutor
@@ -371,11 +374,9 @@ public class MultiThreadedTaskMaster<T e
// stop the execution in case of a fatal exception
if (TaskExceptionResult.FATAL.equals(result)) {
state = ExecutionState.STOPPED;
+ droid.finished();
+ pool.shutdownNow();
}
-
- droid.finished();
- pool.shutdownNow();
-
}
}
}
Propchange:
incubator/droids/branches/0.1.x/droids-core/src/main/java/org/apache/droids/impl/MultiThreadedTaskMaster.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Nov 15 16:41:22 2011
@@ -0,0 +1 @@
+/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/MultiThreadedTaskMaster.java:1127755-1202292
