- opResultMap.put(opResult.getOperationId(), opResult);\r
- Semaphore mutex = semaphoreMap.remove(opResult.getOperationId());\r
- mutex.release();\r
+ Semaphore mutex = semaphoreMap\r
+ .remove(opResult.getDeviceDetails().getDeviceId() + "_" + opResult.getOperationId());\r
+ if (mutex != null) {\r
+ opResultMap.put(opResult.getDeviceDetails().getDeviceId() + "_" + opResult.getOperationId(),\r
+ opResult);\r
+ mutex.release();\r
+ }\r