diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-06-08 23:57:59 +1200 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2018-06-08 23:57:59 +1200 |
commit | fb543fb413652f4cb0408a6caafbdd7f4a4ca369 (patch) | |
tree | bda13c8001013f586ec7062608addf1b7e5a83ed /src/org/traccar/protocol/Stl060FrameDecoder.java | |
parent | ecb7bb33fcec52491f917dbc65a82990dcddb808 (diff) | |
download | trackermap-server-fb543fb413652f4cb0408a6caafbdd7f4a4ca369.tar.gz trackermap-server-fb543fb413652f4cb0408a6caafbdd7f4a4ca369.tar.bz2 trackermap-server-fb543fb413652f4cb0408a6caafbdd7f4a4ca369.zip |
Migrate R and S protocols
Diffstat (limited to 'src/org/traccar/protocol/Stl060FrameDecoder.java')
-rw-r--r-- | src/org/traccar/protocol/Stl060FrameDecoder.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/org/traccar/protocol/Stl060FrameDecoder.java b/src/org/traccar/protocol/Stl060FrameDecoder.java index 455a869ee..831360ec2 100644 --- a/src/org/traccar/protocol/Stl060FrameDecoder.java +++ b/src/org/traccar/protocol/Stl060FrameDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2014 Anton Tananaev (anton@traccar.org) + * Copyright 2014 - 2018 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,9 +15,8 @@ */ package org.traccar.protocol; -import org.jboss.netty.buffer.ChannelBuffer; -import org.jboss.netty.channel.Channel; -import org.jboss.netty.channel.ChannelHandlerContext; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; import org.traccar.CharacterDelimiterFrameDecoder; public class Stl060FrameDecoder extends CharacterDelimiterFrameDecoder { @@ -27,10 +26,9 @@ public class Stl060FrameDecoder extends CharacterDelimiterFrameDecoder { } @Override - protected Object decode( - ChannelHandlerContext ctx, Channel channel, ChannelBuffer buf) throws Exception { + protected Object decode(ChannelHandlerContext ctx, ByteBuf buf) throws Exception { - ChannelBuffer result = (ChannelBuffer) super.decode(ctx, channel, buf); + ByteBuf result = (ByteBuf) super.decode(ctx, buf); if (result != null) { |