2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-03 00:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #420 from ryleykimmel/netty-resource-leak-fix

Browse Source 
Allow Netty to automatically maintain our internal usages of ByteBuf
This commit is contained in:
Major
2019-03-29 22:36:46 +00:00
committed by GitHub
parent d0c97b2e92 3326dba3cd
commit 9633dd0cc8
8 changed files with 33 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/src/main/java/org/apollo/game/release/r317/GroupedRegionUpdateMessageEncoder.java
+1 -1
View File
@@ -47,7 +47,7 @@ public final class GroupedRegionUpdateMessageEncoder extends MessageEncoder<Grou
GamePacket packet = encoder.encode(update);
builder.put(DataType.BYTE, packet.getOpcode());
builder.putBytes(packet.getPayload());
builder.putBytes(packet.content());
}
return builder.toGamePacket();
game/src/main/java/org/apollo/game/release/r317/SpamPacketMessageDecoder.java
+1 -1
View File
@@ -13,7 +13,7 @@ public final class SpamPacketMessageDecoder extends MessageDecoder<SpamPacketMes
@Override
public SpamPacketMessage decode(GamePacket packet) {
return new SpamPacketMessage(packet.getPayload().array());
return new SpamPacketMessage(packet.content().array());
}
}
game/src/main/java/org/apollo/game/release/r377/GroupedRegionUpdateMessageEncoder.java
+1 -1
View File
@@ -47,7 +47,7 @@ public final class GroupedRegionUpdateMessageEncoder extends MessageEncoder<Grou
GamePacket packet = encoder.encode(update);
builder.put(DataType.BYTE, packet.getOpcode());
builder.putBytes(packet.getPayload());
builder.putBytes(packet.content());
}
return builder.toGamePacket();
game/src/main/java/org/apollo/game/release/r377/SpamPacketMessageDecoder.java
+1 -1
View File
@@ -13,7 +13,7 @@ public final class SpamPacketMessageDecoder extends MessageDecoder<SpamPacketMes
@Override
public SpamPacketMessage decode(GamePacket packet) {
return new SpamPacketMessage(packet.getPayload().array());
return new SpamPacketMessage(packet.content().array());
}
}
game/src/main/java/org/apollo/game/session/ApolloHandler.java
+24 -29
View File
@@ -70,37 +70,32 @@ public final class ApolloHandler extends ChannelInboundHandlerAdapter {
@Override
public void channelRead(ChannelHandlerContext ctx, Object message) throws Exception {
try {
Channel channel = ctx.channel();
Attribute<Session> attribute = channel.attr(ApolloHandler.SESSION_KEY);
Session session = attribute.get();
Channel channel = ctx.channel();
Attribute<Session> attribute = channel.attr(ApolloHandler.SESSION_KEY);
Session session = attribute.get();
if (message instanceof HttpRequest || message instanceof JagGrabRequest) {
session = new UpdateSession(channel, serverContext);
if (message instanceof HttpRequest || message instanceof JagGrabRequest) {
session = new UpdateSession(channel, serverContext);
}
if (session != null) {
session.messageReceived(message);
return;
}
// TODO: Perhaps let HandshakeMessage implement Message to remove this explicit check
if (message instanceof HandshakeMessage) {
HandshakeMessage handshakeMessage = (HandshakeMessage) message;
switch (handshakeMessage.getServiceId()) {
case HandshakeConstants.SERVICE_GAME:
attribute.set(new LoginSession(channel, serverContext));
break;
case HandshakeConstants.SERVICE_UPDATE:
attribute.set(new UpdateSession(channel, serverContext));
break;
}
if (session != null) {
session.messageReceived(message);
return;
}
// TODO: Perhaps let HandshakeMessage implement Message to remove this explicit check
if (message instanceof HandshakeMessage) {
HandshakeMessage handshakeMessage = (HandshakeMessage) message;
switch (handshakeMessage.getServiceId()) {
case HandshakeConstants.SERVICE_GAME:
attribute.set(new LoginSession(channel, serverContext));
break;
case HandshakeConstants.SERVICE_UPDATE:
attribute.set(new UpdateSession(channel, serverContext));
break;
}
}
} finally {
ReferenceCountUtil.release(message);
}
}