Unverified Commit e33de4d0 authored by Kevin Di Lallo's avatar Kevin Di Lallo Committed by GitHub
Browse files

Merge pull request #337 from supermikii/my_sp47_prcommentupdate 

Demo3 duplicate tracked devices fix
parents 521551ac 69fbc402

examples/demo3/src/backend/server/demo3_service.go

+33 −29
Original line number Diff line number Diff line
@@ -858,13 +858,14 @@ func addToTrackingDevices(device string) bool { 
	return false

}



func addToAmsKey(device string) {

func addToAmsKey(device string) bool {

	for _, v := range orderedAmsAdded {

		if device == v {

			return

			return true

		}

	}

	orderedAmsAdded = append(orderedAmsAdded, device)

	return false

}



// Rest API handle context state transfer
@@ -885,6 +886,9 @@ func stateTransferPOST(w http.ResponseWriter, r *http.Request) { 
		return

	}



	// Check if device is part of ams

	res := addToAmsKey(targetContextState.Device)

	if !res {

		// Retrieve AMS Resource

		amsResourceBody, _, err := amsClient.AmsiApi.AppMobilityServiceByIdGET(context.TODO(), amsResourceId)

		if err != nil {
@@ -915,7 +919,7 @@ func stateTransferPOST(w http.ResponseWriter, r *http.Request) { 
			http.Error(w, err.Error(), http.StatusInternalServerError)

			return

		}

	addToAmsKey(targetContextState.Device)

	}

	addToTrackingDevices(targetContextState.Device)



	terminalDeviceState[targetContextState.Device] = targetContextState.Counter