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 55af6f1552
commit bf2a99518c
1 changed files with 29 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,20 +95,16 @@ final class DefaultChannelPipeline implements ChannelPipeline {
}
@Override
public ChannelPipeline addFirst(EventExecutorGroup group, String name, ChannelHandler handler) {
synchronized (this) {
name = filterName(name, handler);
addFirst0(new DefaultChannelHandlerContext(this, findInvoker(group), name, handler));
}
public synchronized ChannelPipeline addFirst(EventExecutorGroup group, String name, ChannelHandler handler) {
name = filterName(name, handler);
addFirst0(new DefaultChannelHandlerContext(this, findInvoker(group), name, handler));
return this;
}
@Override
public ChannelPipeline addFirst(ChannelHandlerInvoker invoker, String name, ChannelHandler handler) {
synchronized (this) {
name = filterName(name, handler);
addFirst0(new DefaultChannelHandlerContext(this, invoker, name, handler));
}
name = filterName(name, handler);
addFirst0(new DefaultChannelHandlerContext(this, invoker, name, handler));
return this;
}
@ -130,20 +126,16 @@ final class DefaultChannelPipeline implements ChannelPipeline {
}
@Override
public ChannelPipeline addLast(EventExecutorGroup group, String name, ChannelHandler handler) {
synchronized (this) {
name = filterName(name, handler);
addLast0(new DefaultChannelHandlerContext(this, findInvoker(group), name, handler));
}
public synchronized ChannelPipeline addLast(EventExecutorGroup group, String name, ChannelHandler handler) {
name = filterName(name, handler);
addLast0(new DefaultChannelHandlerContext(this, findInvoker(group), name, handler));
return this;
}
@Override
public ChannelPipeline addLast(ChannelHandlerInvoker invoker, String name, ChannelHandler handler) {
synchronized (this) {
name = filterName(name, handler);
addLast0(new DefaultChannelHandlerContext(this, invoker, name, handler));
}
public synchronized ChannelPipeline addLast(ChannelHandlerInvoker invoker, String name, ChannelHandler handler) {
name = filterName(name, handler);
addLast0(new DefaultChannelHandlerContext(this, invoker, name, handler));
return this;
}
@ -165,23 +157,20 @@ final class DefaultChannelPipeline implements ChannelPipeline {
}
@Override
public ChannelPipeline addBefore(EventExecutorGroup group, String baseName, String name, ChannelHandler handler) {
synchronized (this) {
AbstractChannelHandlerContext ctx = getContextOrDie(baseName);
name = filterName(name, handler);
addBefore0(ctx, new DefaultChannelHandlerContext(this, findInvoker(group), name, handler));
}
public synchronized ChannelPipeline addBefore(
EventExecutorGroup group, String baseName, String name, ChannelHandler handler) {
AbstractChannelHandlerContext ctx = getContextOrDie(baseName);
name = filterName(name, handler);
addBefore0(ctx, new DefaultChannelHandlerContext(this, findInvoker(group), name, handler));
return this;
}
@Override
public ChannelPipeline addBefore(
public synchronized ChannelPipeline addBefore(
ChannelHandlerInvoker invoker, String baseName, String name, ChannelHandler handler) {
synchronized (this) {
AbstractChannelHandlerContext ctx = getContextOrDie(baseName);
name = filterName(name, handler);
addBefore0(ctx, new DefaultChannelHandlerContext(this, invoker, name, handler));
}
AbstractChannelHandlerContext ctx = getContextOrDie(baseName);
name = filterName(name, handler);
addBefore0(ctx, new DefaultChannelHandlerContext(this, invoker, name, handler));
return this;
}
@ -202,24 +191,20 @@ final class DefaultChannelPipeline implements ChannelPipeline {
}
@Override
public ChannelPipeline addAfter(EventExecutorGroup group, String baseName, String name, ChannelHandler handler) {
synchronized (this) {
AbstractChannelHandlerContext ctx = getContextOrDie(baseName);
name = filterName(name, handler);
addAfter0(ctx, new DefaultChannelHandlerContext(this, findInvoker(group), name, handler));
}
public synchronized ChannelPipeline addAfter(
EventExecutorGroup group, String baseName, String name, ChannelHandler handler) {
AbstractChannelHandlerContext ctx = getContextOrDie(baseName);
name = filterName(name, handler);
addAfter0(ctx, new DefaultChannelHandlerContext(this, findInvoker(group), name, handler));
return this;
}
@Override
public ChannelPipeline addAfter(
public synchronized ChannelPipeline addAfter(
ChannelHandlerInvoker invoker, String baseName, String name, ChannelHandler handler) {
synchronized (this) {
AbstractChannelHandlerContext ctx = getContextOrDie(baseName);
name = filterName(name, handler);
addAfter0(ctx, new DefaultChannelHandlerContext(this, invoker, name, handler));
}
AbstractChannelHandlerContext ctx = getContextOrDie(baseName);
name = filterName(name, handler);
addAfter0(ctx, new DefaultChannelHandlerContext(this, invoker, name, handler));
return this;
}