aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/helper
diff options
context:
space:
mode:
authorGabor Somogyi <Gabor_Somogyi@epam.com>2016-05-04 14:36:18 +0200
committerGabor Somogyi <Gabor_Somogyi@epam.com>2016-05-04 14:39:03 +0200
commit516ef6a30eb59e1b9c3aa297e3595c5acf665530 (patch)
tree2bed5e621be4786816bbf3d6adabe41d2d43fbdb /src/org/traccar/helper
parent5bf82eff1ecac7b23661cea14be26aa7a3e4d09a (diff)
parent59f466092c9c875c2bbcb70a2a402aad0edd7639 (diff)
downloadtrackermap-server-516ef6a30eb59e1b9c3aa297e3595c5acf665530.tar.gz
trackermap-server-516ef6a30eb59e1b9c3aa297e3595c5acf665530.tar.bz2
trackermap-server-516ef6a30eb59e1b9c3aa297e3595c5acf665530.zip
Merge branch 'master' into command_framework
Diffstat (limited to 'src/org/traccar/helper')
-rw-r--r--src/org/traccar/helper/Checksum.java6
-rw-r--r--src/org/traccar/helper/Hashing.java4
-rw-r--r--src/org/traccar/helper/Log.java14
-rw-r--r--src/org/traccar/helper/StringFinder.java4
4 files changed, 14 insertions, 14 deletions
diff --git a/src/org/traccar/helper/Checksum.java b/src/org/traccar/helper/Checksum.java
index c156e53f7..6a0a35b16 100644
--- a/src/org/traccar/helper/Checksum.java
+++ b/src/org/traccar/helper/Checksum.java
@@ -16,7 +16,7 @@
package org.traccar.helper;
import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.zip.CRC32;
public final class Checksum {
@@ -158,7 +158,7 @@ public final class Checksum {
public static String nmea(String msg) {
int checksum = 0;
- for (byte b : msg.getBytes(Charset.defaultCharset())) {
+ for (byte b : msg.getBytes(StandardCharsets.US_ASCII)) {
checksum ^= b;
}
return String.format("*%02x", checksum).toUpperCase();
@@ -166,7 +166,7 @@ public final class Checksum {
public static String sum(String msg) {
byte checksum = 0;
- for (byte b : msg.getBytes(Charset.defaultCharset())) {
+ for (byte b : msg.getBytes(StandardCharsets.US_ASCII)) {
checksum += b;
}
return String.format("%02X", checksum).toUpperCase();
diff --git a/src/org/traccar/helper/Hashing.java b/src/org/traccar/helper/Hashing.java
index 29020f3a7..38ae5813e 100644
--- a/src/org/traccar/helper/Hashing.java
+++ b/src/org/traccar/helper/Hashing.java
@@ -15,11 +15,11 @@
*/
package org.traccar.helper;
-import java.security.GeneralSecurityException;
-import java.security.SecureRandom;
import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.PBEKeySpec;
import javax.xml.bind.DatatypeConverter;
+import java.security.GeneralSecurityException;
+import java.security.SecureRandom;
public final class Hashing {
diff --git a/src/org/traccar/helper/Log.java b/src/org/traccar/helper/Log.java
index 2b747734e..d13210a17 100644
--- a/src/org/traccar/helper/Log.java
+++ b/src/org/traccar/helper/Log.java
@@ -15,13 +15,6 @@
*/
package org.traccar.helper;
-import java.io.IOException;
-import java.lang.management.ManagementFactory;
-import java.lang.management.MemoryMXBean;
-import java.lang.management.OperatingSystemMXBean;
-import java.lang.management.RuntimeMXBean;
-import java.nio.charset.Charset;
-
import org.apache.log4j.Appender;
import org.apache.log4j.DailyRollingFileAppender;
import org.apache.log4j.Layout;
@@ -35,6 +28,13 @@ import org.jboss.netty.logging.InternalLogger;
import org.jboss.netty.logging.InternalLoggerFactory;
import org.traccar.Config;
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryMXBean;
+import java.lang.management.OperatingSystemMXBean;
+import java.lang.management.RuntimeMXBean;
+import java.nio.charset.Charset;
+
public final class Log {
private Log() {
diff --git a/src/org/traccar/helper/StringFinder.java b/src/org/traccar/helper/StringFinder.java
index da6a9bdc2..6c1dafcfd 100644
--- a/src/org/traccar/helper/StringFinder.java
+++ b/src/org/traccar/helper/StringFinder.java
@@ -18,7 +18,7 @@ package org.traccar.helper;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBufferIndexFinder;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
public class StringFinder implements ChannelBufferIndexFinder {
@@ -35,7 +35,7 @@ public class StringFinder implements ChannelBufferIndexFinder {
return false;
}
- return string.equals(buffer.toString(guessedIndex, string.length(), Charset.defaultCharset()));
+ return string.equals(buffer.toString(guessedIndex, string.length(), StandardCharsets.US_ASCII));
}
}