Merge pull request #1521 from smartdevicelink/bugfix/fix_on_service_error_log

Robert Henigan · web-flow · commit 3f91db4adcfc · 2020-10-02T10:44:00.000-04:00
Fix onServiceError message in SdlSession
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/session/SdlSession.java b/android/sdl_android/src/main/java/com/smartdevicelink/session/SdlSession.java
@@ -187,7 +187,7 @@ public void onServiceError(SdlPacket packet, SessionType serviceType, int sessio
         if (serviceListeners != null && serviceListeners.containsKey(serviceType)) {
             CopyOnWriteArrayList<ISdlServiceListener> listeners = serviceListeners.get(serviceType);
             for (ISdlServiceListener listener : listeners) {
-                listener.onServiceError(this, serviceType, "End " + serviceType.toString() + " Service NACK'ed");
+                listener.onServiceError(this, serviceType, error);
             }
         }
     }
diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/session/SdlSession.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/session/SdlSession.java
@@ -104,7 +104,7 @@ public void onServiceError(SdlPacket packet, SessionType sessionType, int sessio
         if (serviceListeners != null && serviceListeners.containsKey(sessionType)) {
             CopyOnWriteArrayList<ISdlServiceListener> listeners = serviceListeners.get(sessionType);
             for (ISdlServiceListener listener : listeners) {
-                listener.onServiceError(this, sessionType, "End " + sessionType.toString() + " Service NACK'ed");
+                listener.onServiceError(this, sessionType, error);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ public void onServiceError(SdlPacket packet, SessionType serviceType, int sessio`
`187`	`187`	`if (serviceListeners != null && serviceListeners.containsKey(serviceType)) {`
`188`	`188`	`CopyOnWriteArrayList<ISdlServiceListener> listeners = serviceListeners.get(serviceType);`
`189`	`189`	`for (ISdlServiceListener listener : listeners) {`
`190`		`- listener.onServiceError(this, serviceType, "End " + serviceType.toString() + " Service NACK'ed");`
	`190`	`+ listener.onServiceError(this, serviceType, error);`
`191`	`191`	`}`
`192`	`192`	`}`
`193`	`193`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public void onServiceError(SdlPacket packet, SessionType sessionType, int sessio`
`104`	`104`	`if (serviceListeners != null && serviceListeners.containsKey(sessionType)) {`
`105`	`105`	`CopyOnWriteArrayList<ISdlServiceListener> listeners = serviceListeners.get(sessionType);`
`106`	`106`	`for (ISdlServiceListener listener : listeners) {`
`107`		`- listener.onServiceError(this, sessionType, "End " + sessionType.toString() + " Service NACK'ed");`
	`107`	`+ listener.onServiceError(this, sessionType, error);`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`	`}`