Merge pull request #3917 from Abyss777/netty4_uv

Migrate U,V protocols

1 files changed, 10 insertions, 9 deletions

diff --git a/src/org/traccar/protocol/UlbotechFrameDecoder.java b/src/org/traccar/protocol/UlbotechFrameDecoder.java
index 8e7b497c5..e64791324 100644
--- a/src/org/traccar/protocol/UlbotechFrameDecoder.java
+++ b/src/org/traccar/protocol/UlbotechFrameDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 - 2015 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,19 +15,20 @@
  */
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.frame.FrameDecoder;
+import org.traccar.BaseFrameDecoder;
 
-public class UlbotechFrameDecoder extends FrameDecoder {
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+
+public class UlbotechFrameDecoder extends BaseFrameDecoder {
 
     @Override
     protected Object decode(
             ChannelHandlerContext ctx,
             Channel channel,
-            ChannelBuffer buf) throws Exception {
+            ByteBuf buf) throws Exception {
 
         if (buf.readableBytes() < 2) {
             return null;
@@ -37,7 +38,7 @@ public class UlbotechFrameDecoder extends FrameDecoder {
 
             int index = buf.indexOf(buf.readerIndex() + 1, buf.writerIndex(), (byte) 0xF8);
             if (index != -1) {
-                ChannelBuffer result = ChannelBuffers.buffer(index + 1 - buf.readerIndex());
+                ByteBuf result = Unpooled.buffer(index + 1 - buf.readerIndex());
 
                 while (buf.readerIndex() <= index) {
                     int b = buf.readUnsignedByte();