Skip to content

Commit 6123a0a

Browse files
author
Stefania Alborghetti
authored
Merge pull request #15 from stef1927/dse-netty-4.1.25.Final
2 parents a97716c + 44b2e10 commit 6123a0a

File tree

42 files changed

+136
-119
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+136
-119
lines changed

‎all/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>io.netty</groupId>
2323
<artifactId>netty-parent</artifactId>
24-
<version>4.1.25.4.dse</version>
24+
<version>4.1.25.5.dse</version>
2525
</parent>
2626

2727
<artifactId>netty-all</artifactId>

‎bom/pom.xml‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -69,72 +69,72 @@
6969
<dependency>
7070
<groupId>io.netty</groupId>
7171
<artifactId>netty-buffer</artifactId>
72-
<version>4.1.25.4.dse</version>
72+
<version>4.1.25.5.dse</version>
7373
</dependency>
7474
<dependency>
7575
<groupId>io.netty</groupId>
7676
<artifactId>netty-codec</artifactId>
77-
<version>4.1.25.4.dse</version>
77+
<version>4.1.25.5.dse</version>
7878
</dependency>
7979
<dependency>
8080
<groupId>io.netty</groupId>
8181
<artifactId>netty-codec-dns</artifactId>
82-
<version>4.1.25.4.dse</version>
82+
<version>4.1.25.5.dse</version>
8383
</dependency>
8484
<dependency>
8585
<groupId>io.netty</groupId>
8686
<artifactId>netty-codec-haproxy</artifactId>
87-
<version>4.1.25.4.dse</version>
87+
<version>4.1.25.5.dse</version>
8888
</dependency>
8989
<dependency>
9090
<groupId>io.netty</groupId>
9191
<artifactId>netty-codec-http</artifactId>
92-
<version>4.1.25.4.dse</version>
92+
<version>4.1.25.5.dse</version>
9393
</dependency>
9494
<dependency>
9595
<groupId>io.netty</groupId>
9696
<artifactId>netty-codec-http2</artifactId>
97-
<version>4.1.25.4.dse</version>
97+
<version>4.1.25.5.dse</version>
9898
</dependency>
9999
<dependency>
100100
<groupId>io.netty</groupId>
101101
<artifactId>netty-codec-memcache</artifactId>
102-
<version>4.1.25.4.dse</version>
102+
<version>4.1.25.5.dse</version>
103103
</dependency>
104104
<dependency>
105105
<groupId>io.netty</groupId>
106106
<artifactId>netty-codec-mqtt</artifactId>
107-
<version>4.1.25.4.dse</version>
107+
<version>4.1.25.5.dse</version>
108108
</dependency>
109109
<dependency>
110110
<groupId>io.netty</groupId>
111111
<artifactId>netty-codec-redis</artifactId>
112-
<version>4.1.25.4.dse</version>
112+
<version>4.1.25.5.dse</version>
113113
</dependency>
114114
<dependency>
115115
<groupId>io.netty</groupId>
116116
<artifactId>netty-codec-smtp</artifactId>
117-
<version>4.1.25.4.dse</version>
117+
<version>4.1.25.5.dse</version>
118118
</dependency>
119119
<dependency>
120120
<groupId>io.netty</groupId>
121121
<artifactId>netty-codec-socks</artifactId>
122-
<version>4.1.25.4.dse</version>
122+
<version>4.1.25.5.dse</version>
123123
</dependency>
124124
<dependency>
125125
<groupId>io.netty</groupId>
126126
<artifactId>netty-codec-stomp</artifactId>
127-
<version>4.1.25.4.dse</version>
127+
<version>4.1.25.5.dse</version>
128128
</dependency>
129129
<dependency>
130130
<groupId>io.netty</groupId>
131131
<artifactId>netty-codec-xml</artifactId>
132-
<version>4.1.25.4.dse</version>
132+
<version>4.1.25.5.dse</version>
133133
</dependency>
134134
<dependency>
135135
<groupId>io.netty</groupId>
136136
<artifactId>netty-common</artifactId>
137-
<version>4.1.25.4.dse</version>
137+
<version>4.1.25.5.dse</version>
138138
</dependency>
139139
<dependency>
140140
<groupId>io.netty</groupId>
@@ -144,90 +144,90 @@
144144
<dependency>
145145
<groupId>io.netty</groupId>
146146
<artifactId>netty-handler</artifactId>
147-
<version>4.1.25.4.dse</version>
147+
<version>4.1.25.5.dse</version>
148148
</dependency>
149149
<dependency>
150150
<groupId>io.netty</groupId>
151151
<artifactId>netty-handler-proxy</artifactId>
152-
<version>4.1.25.4.dse</version>
152+
<version>4.1.25.5.dse</version>
153153
</dependency>
154154
<dependency>
155155
<groupId>io.netty</groupId>
156156
<artifactId>netty-resolver</artifactId>
157-
<version>4.1.25.4.dse</version>
157+
<version>4.1.25.5.dse</version>
158158
</dependency>
159159
<dependency>
160160
<groupId>io.netty</groupId>
161161
<artifactId>netty-resolver-dns</artifactId>
162-
<version>4.1.25.4.dse</version>
162+
<version>4.1.25.5.dse</version>
163163
</dependency>
164164
<dependency>
165165
<groupId>io.netty</groupId>
166166
<artifactId>netty-transport</artifactId>
167-
<version>4.1.25.4.dse</version>
167+
<version>4.1.25.5.dse</version>
168168
</dependency>
169169
<dependency>
170170
<groupId>io.netty</groupId>
171171
<artifactId>netty-transport-rxtx</artifactId>
172-
<version>4.1.25.4.dse</version>
172+
<version>4.1.25.5.dse</version>
173173
</dependency>
174174
<dependency>
175175
<groupId>io.netty</groupId>
176176
<artifactId>netty-transport-sctp</artifactId>
177-
<version>4.1.25.4.dse</version>
177+
<version>4.1.25.5.dse</version>
178178
</dependency>
179179
<dependency>
180180
<groupId>io.netty</groupId>
181181
<artifactId>netty-transport-udt</artifactId>
182-
<version>4.1.25.4.dse</version>
182+
<version>4.1.25.5.dse</version>
183183
</dependency>
184184
<dependency>
185185
<groupId>io.netty</groupId>
186186
<artifactId>netty-example</artifactId>
187-
<version>4.1.25.4.dse</version>
187+
<version>4.1.25.5.dse</version>
188188
</dependency>
189189
<dependency>
190190
<groupId>io.netty</groupId>
191191
<artifactId>netty-all</artifactId>
192-
<version>4.1.25.4.dse</version>
192+
<version>4.1.25.5.dse</version>
193193
</dependency>
194194
<dependency>
195195
<groupId>io.netty</groupId>
196196
<artifactId>netty-transport-native-unix-common</artifactId>
197-
<version>4.1.25.4.dse</version>
197+
<version>4.1.25.5.dse</version>
198198
</dependency>
199199
<dependency>
200200
<groupId>io.netty</groupId>
201201
<artifactId>netty-transport-native-unix-common</artifactId>
202-
<version>4.1.25.4.dse</version>
202+
<version>4.1.25.5.dse</version>
203203
<classifier>linux-x86_64</classifier>
204204
</dependency>
205205
<dependency>
206206
<groupId>io.netty</groupId>
207207
<artifactId>netty-transport-native-unix-common</artifactId>
208-
<version>4.1.25.4.dse</version>
208+
<version>4.1.25.5.dse</version>
209209
<classifier>osx-x86_64</classifier>
210210
</dependency>
211211
<dependency>
212212
<groupId>io.netty</groupId>
213213
<artifactId>netty-transport-native-epoll</artifactId>
214-
<version>4.1.25.4.dse</version>
214+
<version>4.1.25.5.dse</version>
215215
</dependency>
216216
<dependency>
217217
<groupId>io.netty</groupId>
218218
<artifactId>netty-transport-native-epoll</artifactId>
219-
<version>4.1.25.4.dse</version>
219+
<version>4.1.25.5.dse</version>
220220
<classifier>linux-x86_64</classifier>
221221
</dependency>
222222
<dependency>
223223
<groupId>io.netty</groupId>
224224
<artifactId>netty-transport-native-kqueue</artifactId>
225-
<version>4.1.25.4.dse</version>
225+
<version>4.1.25.5.dse</version>
226226
</dependency>
227227
<dependency>
228228
<groupId>io.netty</groupId>
229229
<artifactId>netty-transport-native-kqueue</artifactId>
230-
<version>4.1.25.4.dse</version>
230+
<version>4.1.25.5.dse</version>
231231
<classifier>osx-x86_64</classifier>
232232
</dependency>
233233
</dependencies>

‎buffer/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>io.netty</groupId>
2222
<artifactId>netty-parent</artifactId>
23-
<version>4.1.25.4.dse</version>
23+
<version>4.1.25.5.dse</version>
2424
</parent>
2525

2626
<artifactId>netty-buffer</artifactId>

‎buffer/src/main/java/io/netty/buffer/PoolArena.java‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -737,10 +737,10 @@ protected PoolChunk<ByteBuffer> newChunk(int pageSize, int maxOrder,
737737
int pageShifts, int chunkSize) {
738738
if (directMemoryCacheAlignment == 0) {
739739
return new PoolChunk<ByteBuffer>(this,
740-
allocateDirect(chunkSize), pageSize, maxOrder,
740+
PlatformDependent.allocateDirect(chunkSize), pageSize, maxOrder,
741741
pageShifts, chunkSize, 0);
742742
}
743-
final ByteBuffer memory = allocateDirect(chunkSize
743+
final ByteBuffer memory = PlatformDependent.allocateDirect(chunkSize
744744
+ directMemoryCacheAlignment);
745745
return new PoolChunk<ByteBuffer>(this, memory, pageSize,
746746
maxOrder, pageShifts, chunkSize,
@@ -751,26 +751,17 @@ protected PoolChunk<ByteBuffer> newChunk(int pageSize, int maxOrder,
751751
protected PoolChunk<ByteBuffer> newUnpooledChunk(int capacity) {
752752
if (directMemoryCacheAlignment == 0) {
753753
return new PoolChunk<ByteBuffer>(this,
754-
allocateDirect(capacity), capacity, 0);
754+
PlatformDependent.allocateDirect(capacity), capacity, 0);
755755
}
756-
final ByteBuffer memory = allocateDirect(capacity
756+
final ByteBuffer memory = PlatformDependent.allocateDirect(capacity
757757
+ directMemoryCacheAlignment);
758758
return new PoolChunk<ByteBuffer>(this, memory, capacity,
759759
offsetCacheLine(memory));
760760
}
761761

762-
private static ByteBuffer allocateDirect(int capacity) {
763-
return PlatformDependent.useDirectBufferNoCleaner() ?
764-
PlatformDependent.allocateDirectNoCleaner(capacity) : ByteBuffer.allocateDirect(capacity);
765-
}
766-
767762
@Override
768763
protected void destroyChunk(PoolChunk<ByteBuffer> chunk) {
769-
if (PlatformDependent.useDirectBufferNoCleaner()) {
770-
PlatformDependent.freeDirectNoCleaner(chunk.memory);
771-
} else {
772-
PlatformDependent.freeDirectBuffer(chunk.memory);
773-
}
764+
PlatformDependent.freeDirect(chunk.memory);
774765
}
775766

776767
@Override

‎buffer/src/main/java/io/netty/buffer/UnpooledDirectByteBuf.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public UnpooledDirectByteBuf(ByteBufAllocator alloc, int initialCapacity, int ma
6464
}
6565

6666
this.alloc = alloc;
67-
setByteBuffer(ByteBuffer.allocateDirect(initialCapacity));
67+
setByteBuffer(allocateDirect(initialCapacity));
6868
}
6969

7070
/**
@@ -103,14 +103,14 @@ protected UnpooledDirectByteBuf(ByteBufAllocator alloc, ByteBuffer initialBuffer
103103
* Allocate a new direct {@link ByteBuffer} with the given initialCapacity.
104104
*/
105105
protected ByteBuffer allocateDirect(int initialCapacity) {
106-
return ByteBuffer.allocateDirect(initialCapacity);
106+
return PlatformDependent.allocateDirectWithCleaner(initialCapacity);
107107
}
108108

109109
/**
110110
* Free a direct {@link ByteBuffer}
111111
*/
112112
protected void freeDirect(ByteBuffer buffer) {
113-
PlatformDependent.freeDirectBuffer(buffer);
113+
PlatformDependent.freeDirectWithCleaner(buffer);
114114
}
115115

116116
private void setByteBuffer(ByteBuffer buffer) {

‎buffer/src/main/java/io/netty/buffer/UnpooledUnsafeDirectByteBuf.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,14 @@ protected UnpooledUnsafeDirectByteBuf(ByteBufAllocator alloc, ByteBuffer initial
117117
* Allocate a new direct {@link ByteBuffer} with the given initialCapacity.
118118
*/
119119
protected ByteBuffer allocateDirect(int initialCapacity) {
120-
return ByteBuffer.allocateDirect(initialCapacity);
120+
return PlatformDependent.allocateDirectWithCleaner(initialCapacity);
121121
}
122122

123123
/**
124124
* Free a direct {@link ByteBuffer}
125125
*/
126126
protected void freeDirect(ByteBuffer buffer) {
127-
PlatformDependent.freeDirectBuffer(buffer);
127+
PlatformDependent.freeDirectWithCleaner(buffer);
128128
}
129129

130130
final void setByteBuffer(ByteBuffer buffer, boolean tryFree) {

‎codec-dns/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>io.netty</groupId>
2222
<artifactId>netty-parent</artifactId>
23-
<version>4.1.25.4.dse</version>
23+
<version>4.1.25.5.dse</version>
2424
</parent>
2525

2626
<artifactId>netty-codec-dns</artifactId>

‎codec-haproxy/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>io.netty</groupId>
2222
<artifactId>netty-parent</artifactId>
23-
<version>4.1.25.4.dse</version>
23+
<version>4.1.25.5.dse</version>
2424
</parent>
2525

2626
<artifactId>netty-codec-haproxy</artifactId>

‎codec-http/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>io.netty</groupId>
2222
<artifactId>netty-parent</artifactId>
23-
<version>4.1.25.4.dse</version>
23+
<version>4.1.25.5.dse</version>
2424
</parent>
2525

2626
<artifactId>netty-codec-http</artifactId>

‎codec-http2/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>io.netty</groupId>
2222
<artifactId>netty-parent</artifactId>
23-
<version>4.1.25.4.dse</version>
23+
<version>4.1.25.5.dse</version>
2424
</parent>
2525

2626
<artifactId>netty-codec-http2</artifactId>

0 commit comments

Comments
 (0)