Commit b19274ed95b00e9e0bfc41246c9ef202f5e63be8

Authored by Igor Kulikov
Committed by GitHub
2 parents 309598c2 3fa9437e

Merge pull request #834 from lonwern/master

Fixed couldn't get shared attributes.
@@ -294,7 +294,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso @@ -294,7 +294,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
294 private void handleGetAttributesRequest(DeviceToDeviceActorMsg src) { 294 private void handleGetAttributesRequest(DeviceToDeviceActorMsg src) {
295 GetAttributesRequest request = (GetAttributesRequest) src.getPayload(); 295 GetAttributesRequest request = (GetAttributesRequest) src.getPayload();
296 ListenableFuture<List<AttributeKvEntry>> clientAttributesFuture = getAttributeKvEntries(deviceId, DataConstants.CLIENT_SCOPE, request.getClientAttributeNames()); 296 ListenableFuture<List<AttributeKvEntry>> clientAttributesFuture = getAttributeKvEntries(deviceId, DataConstants.CLIENT_SCOPE, request.getClientAttributeNames());
297 - ListenableFuture<List<AttributeKvEntry>> sharedAttributesFuture = getAttributeKvEntries(deviceId, DataConstants.SHARED_SCOPE, request.getClientAttributeNames()); 297 + ListenableFuture<List<AttributeKvEntry>> sharedAttributesFuture = getAttributeKvEntries(deviceId, DataConstants.SHARED_SCOPE, request.getSharedAttributeNames());
298 298
299 Futures.addCallback(Futures.allAsList(Arrays.asList(clientAttributesFuture, sharedAttributesFuture)), new FutureCallback<List<List<AttributeKvEntry>>>() { 299 Futures.addCallback(Futures.allAsList(Arrays.asList(clientAttributesFuture, sharedAttributesFuture)), new FutureCallback<List<List<AttributeKvEntry>>>() {
300 @Override 300 @Override