aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/web
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-09-21 23:19:23 +1200
committerGitHub <noreply@github.com>2016-09-21 23:19:23 +1200
commitaff998db51d9fa4b66018139a4c5375a42ff42e8 (patch)
tree5aa7d8823c0ca11f0396ca11de2a6df68ebba048 /src/org/traccar/web
parent9ee812366367148387f289b9977fd809e6a56786 (diff)
parentfbe0190e65ee0646f6521cfca31ecfa3efa10472 (diff)
downloadtraccar-server-aff998db51d9fa4b66018139a4c5375a42ff42e8.tar.gz
traccar-server-aff998db51d9fa4b66018139a4c5375a42ff42e8.tar.bz2
traccar-server-aff998db51d9fa4b66018139a4c5375a42ff42e8.zip
Merge pull request #2348 from Abyss777/ignore_odometer
Add parameter "report.ignoreOdometer"
Diffstat (limited to 'src/org/traccar/web')
-rw-r--r--src/org/traccar/web/CsvBuilder.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/web/CsvBuilder.java b/src/org/traccar/web/CsvBuilder.java
index a25b839a9..f59aabc7f 100644
--- a/src/org/traccar/web/CsvBuilder.java
+++ b/src/org/traccar/web/CsvBuilder.java
@@ -37,10 +37,10 @@ public class CsvBuilder {
SortedSet<Method> methods = new TreeSet<Method>(new Comparator<Method>() {
@Override
public int compare(Method m1, Method m2) {
- if (m1.getName().equals("getAttributes") & !m1.getName().equals(m2.getName())) {
+ if (m1.getName().equals("getAttributes") && !m1.getName().equals(m2.getName())) {
return 1;
}
- if (m2.getName().equals("getAttributes") & !m1.getName().equals(m2.getName())) {
+ if (m2.getName().equals("getAttributes") && !m1.getName().equals(m2.getName())) {
return -1;
}
return m1.getName().compareTo(m2.getName());