diff options
| author | Hans van den Elsen <hans.elsen@esds.nl> | 2016-03-11 22:16:25 +0100 |
|---|---|---|
| committer | Hans van den Elsen <hans.elsen@esds.nl> | 2016-03-11 22:16:25 +0100 |
| commit | 4606737cc07b736f9c8f98ae680b928c94c082c8 (patch) | |
| tree | bdd29b24a16403b1e8a3d7cd4325391063b34b8a /src/org/traccar/protocol/CarscopProtocol.java | |
| parent | 3ced99384b1967f5cde9abdf30c1c0184a5ae3f6 (diff) | |
| parent | ab5d21e16ac44957e04da0f06daf148af95e96be (diff) | |
| download | trackermap-server-4606737cc07b736f9c8f98ae680b928c94c082c8.tar.gz trackermap-server-4606737cc07b736f9c8f98ae680b928c94c082c8.tar.bz2 trackermap-server-4606737cc07b736f9c8f98ae680b928c94c082c8.zip | |
Merge remote-tracking branch 'refs/remotes/tananaev/master'
Diffstat (limited to 'src/org/traccar/protocol/CarscopProtocol.java')
| -rw-r--r-- | src/org/traccar/protocol/CarscopProtocol.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/CarscopProtocol.java b/src/org/traccar/protocol/CarscopProtocol.java index 1ac3e5e9f..4432fb87a 100644 --- a/src/org/traccar/protocol/CarscopProtocol.java +++ b/src/org/traccar/protocol/CarscopProtocol.java @@ -37,8 +37,8 @@ public class CarscopProtocol extends BaseProtocol { @Override protected void addSpecificHandlers(ChannelPipeline pipeline) { pipeline.addLast("frameDecoder", new CharacterDelimiterFrameDecoder(1024, '^')); - pipeline.addLast("stringDecoder", new StringDecoder()); pipeline.addLast("stringEncoder", new StringEncoder()); + pipeline.addLast("stringDecoder", new StringDecoder()); pipeline.addLast("objectDecoder", new CarscopProtocolDecoder(CarscopProtocol.this)); } }); |