andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed issue NETTY-50 (Dead lock in MemoryAwareThreadPoolExecutor)

Browse Source 
* Made sure that the max memory size properties become immutable
This commit is contained in:
Trustin Lee 2008-09-30 00:31:32 +00:00
parent 50f043fa3e
commit 6f18c940dd
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/jboss/netty/handler/execution/MemoryAwareThreadPoolExecutor.java
View File

@ -197,6 +197,12 @@ public class MemoryAwareThreadPoolExecutor extends ThreadPoolExecutor {
throw new IllegalArgumentException(
"maxChannelMemorySize: " + maxChannelMemorySize);
}
if (getTaskCount() > 0) {
throw new IllegalStateException(
"can't be changed after a task is executed");
}
settings = new Settings(maxChannelMemorySize, settings.maxTotalMemorySize);
}
@ -216,6 +222,12 @@ public class MemoryAwareThreadPoolExecutor extends ThreadPoolExecutor {
throw new IllegalArgumentException(
"maxTotalMemorySize: " + maxTotalMemorySize);
}
if (getTaskCount() > 0) {
throw new IllegalStateException(
"can't be changed after a task is executed");
}
settings = new Settings(settings.maxChannelMemorySize, maxTotalMemorySize);
}