diff options
| author | Ivan Muratov <binakot@gmail.com> | 2017-10-24 14:52:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-24 14:52:48 +0300 |
| commit | db02157dbb29539dda4b51a5e8b317293cfc536c (patch) | |
| tree | b974f082172406e16a92cb9da8136ef856f571a5 /src/org/traccar/processing/CopyAttributesHandler.java | |
| parent | 09d3cf2b5416327700ad22b652cf4a0dca09aaf2 (diff) | |
| parent | 96e15853b9c28bd31295ca2c014e226e4a50aaa1 (diff) | |
| download | trackermap-server-db02157dbb29539dda4b51a5e8b317293cfc536c.tar.gz trackermap-server-db02157dbb29539dda4b51a5e8b317293cfc536c.tar.bz2 trackermap-server-db02157dbb29539dda4b51a5e8b317293cfc536c.zip | |
Merge branch 'master' into master
Diffstat (limited to 'src/org/traccar/processing/CopyAttributesHandler.java')
| -rw-r--r-- | src/org/traccar/processing/CopyAttributesHandler.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/org/traccar/processing/CopyAttributesHandler.java b/src/org/traccar/processing/CopyAttributesHandler.java index 3a96ca98d..9fbcfa73f 100644 --- a/src/org/traccar/processing/CopyAttributesHandler.java +++ b/src/org/traccar/processing/CopyAttributesHandler.java @@ -32,9 +32,14 @@ public class CopyAttributesHandler extends BaseDataHandler { @Override protected Position handlePosition(Position position) { String attributesString = Context.getDeviceManager().lookupAttributeString( - position.getDeviceId(), "processing.copyAttributes", null, true); + position.getDeviceId(), "processing.copyAttributes", "", true); Position last = getLastPosition(position.getDeviceId()); - if (attributesString != null && last != null) { + if (attributesString.isEmpty()) { + attributesString = Position.KEY_DRIVER_UNIQUE_ID; + } else { + attributesString += "," + Position.KEY_DRIVER_UNIQUE_ID; + } + if (last != null) { for (String attribute : attributesString.split("[ ,]")) { if (last.getAttributes().containsKey(attribute) && !position.getAttributes().containsKey(attribute)) { position.getAttributes().put(attribute, last.getAttributes().get(attribute)); |