summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrettyWhite <geekman3454@protonmail.com>2019-03-01 09:31:03 -0500
committerBrettyWhite <geekman3454@protonmail.com>2019-03-01 09:31:03 -0500
commit3f3d96060475ec27279c2045017890f3e81f958f (patch)
treead18071a69bb97312af1a7e0c6d3d2b13c1f3195
parentde93f33283f8966bfccd9dbd5a053a40e86f7503 (diff)
downloadsdl_android-3f3d96060475ec27279c2045017890f3e81f958f.tar.gz
fix trace changing the correlation ID
-rw-r--r--sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequest.java4
-rw-r--r--sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java1
2 files changed, 4 insertions, 1 deletions
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequest.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequest.java
index 8b3d042cc..e6a92924e 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequest.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequest.java
@@ -23,7 +23,9 @@ public class RPCRequest extends RPCMessage {
public RPCRequest(RPCRequest request){
super(request);
- setCorrelationID(CorrelationIdGenerator.generateId());
+ if (request.getCorrelationID() == null) {
+ setCorrelationID(CorrelationIdGenerator.generateId());
+ }
}
public Integer getCorrelationID() {
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
index db34c1954..96b55ada8 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
@@ -2326,6 +2326,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
if (messageType.equals(RPCMessage.KEY_REQUEST)) {
RPCMessage convertedRPCMsg = RpcConverter.convertTableToRpc(hash);
+ SdlTrace.logRPCEvent(InterfaceActivityDirection.Receive, new RPCRequest((RPCRequest)convertedRPCMsg), SDL_LIB_TRACE_KEY);
if (convertedRPCMsg != null) {
convertedRPCMsg.format(rpcSpecVersion, true);