aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-03-18 07:55:23 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2016-03-18 07:55:23 +1300
commit0631d21876e8cd76210b7cceaedb5b2bd5a933b9 (patch)
tree06554c4b4538b97d9f59e7be8d1dd8718620a0dd /src/org
parent0aaf7151eec458f4163e24768dca79328f47c7d7 (diff)
parentde22e61f5a09243f314b619c48466a25d71d4043 (diff)
downloadtrackermap-server-0631d21876e8cd76210b7cceaedb5b2bd5a933b9.tar.gz
trackermap-server-0631d21876e8cd76210b7cceaedb5b2bd5a933b9.tar.bz2
trackermap-server-0631d21876e8cd76210b7cceaedb5b2bd5a933b9.zip
Merge pull request #1794 from hanselsen/master
Minifinder needs a stringEncoder in pipeline
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/protocol/MiniFinderProtocol.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/org/traccar/protocol/MiniFinderProtocol.java b/src/org/traccar/protocol/MiniFinderProtocol.java
index b22539277..5557124e7 100644
--- a/src/org/traccar/protocol/MiniFinderProtocol.java
+++ b/src/org/traccar/protocol/MiniFinderProtocol.java
@@ -18,6 +18,7 @@ package org.traccar.protocol;
import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.handler.codec.string.StringDecoder;
+import org.jboss.netty.handler.codec.string.StringEncoder;
import org.traccar.BaseProtocol;
import org.traccar.CharacterDelimiterFrameDecoder;
import org.traccar.TrackerServer;
@@ -40,6 +41,7 @@ public class MiniFinderProtocol extends BaseProtocol {
pipeline.addLast("frameDecoder", new CharacterDelimiterFrameDecoder(1024, ';'));
pipeline.addLast("stringDecoder", new StringDecoder());
pipeline.addLast("objectDecoder", new MiniFinderProtocolDecoder(MiniFinderProtocol.this));
+ pipeline.addLast("stringEncoder", new StringEncoder());
pipeline.addLast("objectEncoder", new MiniFinderProtocolEncoder());
}
});