diff options
| author | ninioe <ninioe@gmail.com> | 2016-08-04 09:51:40 +0300 |
|---|---|---|
| committer | ninioe <ninioe@gmail.com> | 2016-08-04 09:51:40 +0300 |
| commit | b2613805e5de4b7d3755b063ad76d737e713616f (patch) | |
| tree | 726c0c6effdeced9903b6b26ef0480047d2d179c /src/org/traccar/protocol | |
| parent | 6f32f4a9460ff3be2823d7a133659d29bf057237 (diff) | |
| parent | 41668cae9763a523c775a8a998620fe286176c9e (diff) | |
| download | traccar-server-b2613805e5de4b7d3755b063ad76d737e713616f.tar.gz traccar-server-b2613805e5de4b7d3755b063ad76d737e713616f.tar.bz2 traccar-server-b2613805e5de4b7d3755b063ad76d737e713616f.zip | |
Merge remote-tracking branch 'refs/remotes/tananaev/master'
Diffstat (limited to 'src/org/traccar/protocol')
| -rw-r--r-- | src/org/traccar/protocol/GatorProtocol.java | 4 | ||||
| -rw-r--r-- | src/org/traccar/protocol/TzoneProtocol.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/GatorProtocol.java b/src/org/traccar/protocol/GatorProtocol.java index 3776bcfd3..3d899fa1f 100644 --- a/src/org/traccar/protocol/GatorProtocol.java +++ b/src/org/traccar/protocol/GatorProtocol.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com) + * Copyright 2015 - 2016 Anton Tananaev (anton.tananaev@gmail.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ public class GatorProtocol extends BaseProtocol { serverList.add(new TrackerServer(new ServerBootstrap(), this.getName()) { @Override protected void addSpecificHandlers(ChannelPipeline pipeline) { - pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(1024, 3, 2, 1, 0)); + pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(1024, 3, 2)); pipeline.addLast("objectDecoder", new GatorProtocolDecoder(GatorProtocol.this)); } }); diff --git a/src/org/traccar/protocol/TzoneProtocol.java b/src/org/traccar/protocol/TzoneProtocol.java index 2d98e3f79..fcf673a57 100644 --- a/src/org/traccar/protocol/TzoneProtocol.java +++ b/src/org/traccar/protocol/TzoneProtocol.java @@ -34,7 +34,7 @@ public class TzoneProtocol extends BaseProtocol { serverList.add(new TrackerServer(new ServerBootstrap(), this.getName()) { @Override protected void addSpecificHandlers(ChannelPipeline pipeline) { - pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(256, 2, 2)); + pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(256, 2, 2, 2, 0)); pipeline.addLast("objectDecoder", new TzoneProtocolDecoder(TzoneProtocol.this)); } }); |