summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenigan <rheniga1@MGC12Z921DLVCG.fbpld77.ford.com>2020-12-04 16:48:33 -0500
committerHenigan <rheniga1@MGC12Z921DLVCG.fbpld77.ford.com>2020-12-04 16:48:33 -0500
commitbf170e4d1740f0948e4ddf2418139ed0240baf7d (patch)
treef656a19420041824c0e515ebba79f5e0cede91d3
parent72fd8ea73b966fbd24f1dd54f8a102f0ae5f1c20 (diff)
downloadsdl_android-bugfix/issue_1574.tar.gz
Rename new mapbugfix/issue_1574
-rw-r--r--base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java b/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java
index d247fc8d8..0b42fcc15 100644
--- a/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java
+++ b/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java
@@ -103,7 +103,7 @@ public class SdlProtocolBase {
private final Hashtable<Byte, Object> _messageLocks = new Hashtable<>();
private final HashMap<SessionType, Long> mtus = new HashMap<>();
private final HashMap<SessionType, TransportRecord> activeTransports = new HashMap<>();
- private final HashMap<SessionType, Boolean> serviceOnTransport = new HashMap<>();
+ private final HashMap<SessionType, Boolean> serviceStartedOnTransport = new HashMap<>();
private final Map<TransportType, List<ISecondaryTransportListener>> secondaryTransportListeners = new HashMap<>();
@@ -213,7 +213,7 @@ public class SdlProtocolBase {
messageID = 0;
headerSize = V1_HEADER_SIZE;
this.activeTransports.clear();
- this.serviceOnTransport.clear();
+ this.serviceStartedOnTransport.clear();
this.mtus.clear();
mtus.put(SessionType.RPC, (long) (V1_V2_MTU_SIZE - headerSize));
this.secondaryTransportParams = null;
@@ -710,7 +710,7 @@ public class SdlProtocolBase {
public void startService(SessionType serviceType, byte sessionID, boolean isEncrypted) {
final SdlPacket header = SdlPacketFactory.createStartSession(serviceType, 0x00, (byte) protocolVersion.getMajor(), sessionID, isEncrypted);
- serviceOnTransport.put(serviceType, true);
+ serviceStartedOnTransport.put(serviceType, true);
if (SessionType.RPC.equals(serviceType)) {
if (connectedPrimaryTransport != null) {
header.setTransportRecord(connectedPrimaryTransport);
@@ -1196,17 +1196,17 @@ public class SdlProtocolBase {
//a single transport record per transport.
//TransportType type = disconnectedTransport.getType();
if (getTransportForSession(SessionType.NAV) != null && disconnectedTransport.equals(getTransportForSession(SessionType.NAV))) {
- if (serviceOnTransport.get(SessionType.NAV) != null && serviceOnTransport.get(SessionType.NAV)) {
+ if (serviceStartedOnTransport.get(SessionType.NAV) != null && serviceStartedOnTransport.get(SessionType.NAV)) {
iSdlProtocol.onServiceError(null, SessionType.NAV, iSdlProtocol.getSessionId(), "Transport disconnected");
activeTransports.remove(SessionType.NAV);
- serviceOnTransport.remove(SessionType.NAV);
+ serviceStartedOnTransport.remove(SessionType.NAV);
}
}
if (getTransportForSession(SessionType.PCM) != null && disconnectedTransport.equals(getTransportForSession(SessionType.PCM))) {
- if (serviceOnTransport.get(SessionType.PCM) != null && serviceOnTransport.get(SessionType.PCM)) {
+ if (serviceStartedOnTransport.get(SessionType.PCM) != null && serviceStartedOnTransport.get(SessionType.PCM)) {
iSdlProtocol.onServiceError(null, SessionType.PCM, iSdlProtocol.getSessionId(), "Transport disconnected");
activeTransports.remove(SessionType.PCM);
- serviceOnTransport.remove(SessionType.PCM);
+ serviceStartedOnTransport.remove(SessionType.PCM);
}
}
@@ -1264,7 +1264,7 @@ public class SdlProtocolBase {
requestedSession = false;
activeTransports.clear();
- serviceOnTransport.clear();
+ serviceStartedOnTransport.clear();
iSdlProtocol.onTransportDisconnected(info, primaryTransportAvailable, transportConfig);