From 22d3d0b95866dd273a5c4537d727758e8a1ddd15 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Tue, 22 Mar 2016 10:17:04 +1300 Subject: Fix minor issues in the code --- src/org/traccar/ExtendedObjectDecoder.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'src/org/traccar/ExtendedObjectDecoder.java') diff --git a/src/org/traccar/ExtendedObjectDecoder.java b/src/org/traccar/ExtendedObjectDecoder.java index 900b7bdbc..329490d29 100644 --- a/src/org/traccar/ExtendedObjectDecoder.java +++ b/src/org/traccar/ExtendedObjectDecoder.java @@ -16,6 +16,7 @@ package org.traccar; import java.net.SocketAddress; +import java.nio.charset.Charset; import java.util.Collection; import org.jboss.netty.buffer.ChannelBuffer; @@ -34,16 +35,13 @@ import javax.xml.bind.DatatypeConverter; public abstract class ExtendedObjectDecoder implements ChannelUpstreamHandler { private void saveOriginal(Object decodedMessage, Object originalMessage) { - if (Context.getConfig().getBoolean("database.saveOriginal")) { - if (decodedMessage instanceof Position) { - Position position = (Position) decodedMessage; - if (originalMessage instanceof ChannelBuffer) { - position.set(Event.KEY_ORIGINAL, - ChannelBuffers.hexDump((ChannelBuffer) originalMessage)); - } else if (originalMessage instanceof String) { - position.set(Event.KEY_ORIGINAL, - DatatypeConverter.printHexBinary(((String) originalMessage).getBytes())); - } + if (Context.getConfig().getBoolean("database.saveOriginal") && decodedMessage instanceof Position) { + Position position = (Position) decodedMessage; + if (originalMessage instanceof ChannelBuffer) { + position.set(Event.KEY_ORIGINAL, ChannelBuffers.hexDump((ChannelBuffer) originalMessage)); + } else if (originalMessage instanceof String) { + position.set(Event.KEY_ORIGINAL, DatatypeConverter.printHexBinary( + ((String) originalMessage).getBytes(Charset.defaultCharset()))); } } } -- cgit v1.2.3