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

Simplify synchronized syntax

Browse Source 
Motivation:

We often used synchronized(this) while the whole method was synchronized, which can be simplified by just mark the whole method as synchronized.

Modifications:

Replace synchronized(this) with synchronized on the method

Result:

Cleaner code
This commit is contained in:
Norman Maurer 2016-01-01 20:55:48 +01:00
parent 88178584c4
commit bdea94d807
1 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java
View File

@ -108,13 +108,10 @@ final class DefaultChannelPipeline implements ChannelPipeline {
}
@Override
public ChannelPipeline addFirst(EventExecutorGroup group, final String name, ChannelHandler handler) {
synchronized (this) {
checkDuplicateName(name);
AbstractChannelHandlerContext newCtx = newContext(group, name, handler);
addFirst0(newCtx);
}
public synchronized ChannelPipeline addFirst(EventExecutorGroup group, final String name, ChannelHandler handler) {
checkDuplicateName(name);
AbstractChannelHandlerContext newCtx = newContext(group, name, handler);
addFirst0(newCtx);
return this;
}
@ -136,13 +133,10 @@ final class DefaultChannelPipeline implements ChannelPipeline {
}
@Override
public ChannelPipeline addLast(EventExecutorGroup group, final String name, ChannelHandler handler) {
synchronized (this) {
checkDuplicateName(name);
AbstractChannelHandlerContext newCtx = newContext(group, name, handler);
addLast0(newCtx);
}
public synchronized ChannelPipeline addLast(EventExecutorGroup group, final String name, ChannelHandler handler) {
checkDuplicateName(name);
AbstractChannelHandlerContext newCtx = newContext(group, name, handler);
addLast0(newCtx);
return this;
}
@ -164,14 +158,12 @@ final class DefaultChannelPipeline implements ChannelPipeline {
}
@Override
public ChannelPipeline addBefore(
public synchronized ChannelPipeline addBefore(
EventExecutorGroup group, String baseName, final String name, ChannelHandler handler) {
synchronized (this) {
AbstractChannelHandlerContext ctx = getContextOrDie(baseName);
checkDuplicateName(name);
AbstractChannelHandlerContext newCtx = newContext(group, name, handler);
addBefore0(ctx, newCtx);
}
AbstractChannelHandlerContext ctx = getContextOrDie(baseName);
checkDuplicateName(name);
AbstractChannelHandlerContext newCtx = newContext(group, name, handler);
addBefore0(ctx, newCtx);
return this;
}
@ -192,15 +184,12 @@ final class DefaultChannelPipeline implements ChannelPipeline {
}
@Override
public ChannelPipeline addAfter(
public synchronized ChannelPipeline addAfter(
EventExecutorGroup group, String baseName, final String name, ChannelHandler handler) {
synchronized (this) {
AbstractChannelHandlerContext ctx = getContextOrDie(baseName);
checkDuplicateName(name);
AbstractChannelHandlerContext newCtx = newContext(group, name, handler);
addAfter0(ctx, newCtx);
}
AbstractChannelHandlerContext ctx = getContextOrDie(baseName);
checkDuplicateName(name);
AbstractChannelHandlerContext newCtx = newContext(group, name, handler);
addAfter0(ctx, newCtx);
return this;
}