Skip to content

Commit bf2a995

Browse files
committed
Simplify synchronized syntax
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
1 parent 55af6f1 commit bf2a995

File tree

1 file changed

+29
-44
lines changed

1 file changed

+29
-44
lines changed

transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java

Lines changed: 29 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -95,20 +95,16 @@ public ChannelPipeline addFirst(String name, ChannelHandler handler) {
9595
}
9696

9797
@Override
98-
public ChannelPipeline addFirst(EventExecutorGroup group, String name, ChannelHandler handler) {
99-
synchronized (this) {
100-
name = filterName(name, handler);
101-
addFirst0(new DefaultChannelHandlerContext(this, findInvoker(group), name, handler));
102-
}
98+
public synchronized ChannelPipeline addFirst(EventExecutorGroup group, String name, ChannelHandler handler) {
99+
name = filterName(name, handler);
100+
addFirst0(new DefaultChannelHandlerContext(this, findInvoker(group), name, handler));
103101
return this;
104102
}
105103

106104
@Override
107105
public ChannelPipeline addFirst(ChannelHandlerInvoker invoker, String name, ChannelHandler handler) {
108-
synchronized (this) {
109-
name = filterName(name, handler);
110-
addFirst0(new DefaultChannelHandlerContext(this, invoker, name, handler));
111-
}
106+
name = filterName(name, handler);
107+
addFirst0(new DefaultChannelHandlerContext(this, invoker, name, handler));
112108
return this;
113109
}
114110

@@ -130,20 +126,16 @@ public ChannelPipeline addLast(String name, ChannelHandler handler) {
130126
}
131127

132128
@Override
133-
public ChannelPipeline addLast(EventExecutorGroup group, String name, ChannelHandler handler) {
134-
synchronized (this) {
135-
name = filterName(name, handler);
136-
addLast0(new DefaultChannelHandlerContext(this, findInvoker(group), name, handler));
137-
}
129+
public synchronized ChannelPipeline addLast(EventExecutorGroup group, String name, ChannelHandler handler) {
130+
name = filterName(name, handler);
131+
addLast0(new DefaultChannelHandlerContext(this, findInvoker(group), name, handler));
138132
return this;
139133
}
140134

141135
@Override
142-
public ChannelPipeline addLast(ChannelHandlerInvoker invoker, String name, ChannelHandler handler) {
143-
synchronized (this) {
144-
name = filterName(name, handler);
145-
addLast0(new DefaultChannelHandlerContext(this, invoker, name, handler));
146-
}
136+
public synchronized ChannelPipeline addLast(ChannelHandlerInvoker invoker, String name, ChannelHandler handler) {
137+
name = filterName(name, handler);
138+
addLast0(new DefaultChannelHandlerContext(this, invoker, name, handler));
147139
return this;
148140
}
149141

@@ -165,23 +157,20 @@ public ChannelPipeline addBefore(String baseName, String name, ChannelHandler ha
165157
}
166158

167159
@Override
168-
public ChannelPipeline addBefore(EventExecutorGroup group, String baseName, String name, ChannelHandler handler) {
169-
synchronized (this) {
170-
AbstractChannelHandlerContext ctx = getContextOrDie(baseName);
171-
name = filterName(name, handler);
172-
addBefore0(ctx, new DefaultChannelHandlerContext(this, findInvoker(group), name, handler));
173-
}
160+
public synchronized ChannelPipeline addBefore(
161+
EventExecutorGroup group, String baseName, String name, ChannelHandler handler) {
162+
AbstractChannelHandlerContext ctx = getContextOrDie(baseName);
163+
name = filterName(name, handler);
164+
addBefore0(ctx, new DefaultChannelHandlerContext(this, findInvoker(group), name, handler));
174165
return this;
175166
}
176167

177168
@Override
178-
public ChannelPipeline addBefore(
169+
public synchronized ChannelPipeline addBefore(
179170
ChannelHandlerInvoker invoker, String baseName, String name, ChannelHandler handler) {
180-
synchronized (this) {
181-
AbstractChannelHandlerContext ctx = getContextOrDie(baseName);
182-
name = filterName(name, handler);
183-
addBefore0(ctx, new DefaultChannelHandlerContext(this, invoker, name, handler));
184-
}
171+
AbstractChannelHandlerContext ctx = getContextOrDie(baseName);
172+
name = filterName(name, handler);
173+
addBefore0(ctx, new DefaultChannelHandlerContext(this, invoker, name, handler));
185174
return this;
186175
}
187176

@@ -202,24 +191,20 @@ public ChannelPipeline addAfter(String baseName, String name, ChannelHandler han
202191
}
203192

204193
@Override
205-
public ChannelPipeline addAfter(EventExecutorGroup group, String baseName, String name, ChannelHandler handler) {
206-
synchronized (this) {
207-
AbstractChannelHandlerContext ctx = getContextOrDie(baseName);
208-
name = filterName(name, handler);
209-
addAfter0(ctx, new DefaultChannelHandlerContext(this, findInvoker(group), name, handler));
210-
}
194+
public synchronized ChannelPipeline addAfter(
195+
EventExecutorGroup group, String baseName, String name, ChannelHandler handler) {
196+
AbstractChannelHandlerContext ctx = getContextOrDie(baseName);
197+
name = filterName(name, handler);
198+
addAfter0(ctx, new DefaultChannelHandlerContext(this, findInvoker(group), name, handler));
211199
return this;
212200
}
213201

214202
@Override
215-
public ChannelPipeline addAfter(
203+
public synchronized ChannelPipeline addAfter(
216204
ChannelHandlerInvoker invoker, String baseName, String name, ChannelHandler handler) {
217-
218-
synchronized (this) {
219-
AbstractChannelHandlerContext ctx = getContextOrDie(baseName);
220-
name = filterName(name, handler);
221-
addAfter0(ctx, new DefaultChannelHandlerContext(this, invoker, name, handler));
222-
}
205+
AbstractChannelHandlerContext ctx = getContextOrDie(baseName);
206+
name = filterName(name, handler);
207+
addAfter0(ctx, new DefaultChannelHandlerContext(this, invoker, name, handler));
223208
return this;
224209
}
225210

0 commit comments

Comments
 (0)