diff --git a/bin/pull_mqtt b/bin/pull_mqtt index 400b5bda9..db70d856a 100755 --- a/bin/pull_mqtt +++ b/bin/pull_mqtt @@ -55,7 +55,7 @@ sudo mosquitto_sub $SERVER_OPTS -R -F "%j" -t $topic_filter | out_path=$OUT_BASE/$registryId/devices/$deviceId/${timepath}/${usetime}_${subFolder}_${subType} out_dir=$(dirname $out_path) mkdir -p $out_dir - echo $(realpath --relative-to $OUT_BASE $out_path).json $topic + echo $(realpath --relative-to $UDMI_ROOT $out_path).json $topic echo $json > $out_path.json echo {} | jq ".deviceRegistryId=\"$registryId\" | \ .subFolder=\"$subFolder\" | diff --git a/udmis/src/main/java/com/google/bos/udmi/service/core/ReflectProcessor.java b/udmis/src/main/java/com/google/bos/udmi/service/core/ReflectProcessor.java index 6a26f7ea2..23e3a3b64 100644 --- a/udmis/src/main/java/com/google/bos/udmi/service/core/ReflectProcessor.java +++ b/udmis/src/main/java/com/google/bos/udmi/service/core/ReflectProcessor.java @@ -286,7 +286,7 @@ private CloudModel queryDeviceState(Envelope attributes) { private CloudModel reflectModel(Envelope attributes, CloudModel request) { CloudModel modelResult = updateModel(attributes, request); ifNotNullThen(extractModel(request), - model -> publish(makeTargetEnvelope(attributes), modelResult)); + model -> publish(makeTargetEnvelope(attributes), model)); return modelResult; }