From 016a0362f9eb00dc64511d9e32b920aa04ab8a48 Mon Sep 17 00:00:00 2001 From: vlad Date: Mon, 26 Sep 2016 13:05:25 -0700 Subject: Uptime in /version and empty entity fix --- src/main/scala/com/drivergrp/core/rest.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/main/scala/com/drivergrp/core/rest.scala') diff --git a/src/main/scala/com/drivergrp/core/rest.scala b/src/main/scala/com/drivergrp/core/rest.scala index ebfb98e..89a0c75 100644 --- a/src/main/scala/com/drivergrp/core/rest.scala +++ b/src/main/scala/com/drivergrp/core/rest.scala @@ -60,7 +60,9 @@ object rest { log.audit(s"Sending to ${request.uri} request $request") val responseEntity = Http()(actorSystem).singleRequest(request)(materializer) map { response => - if(response.status.isFailure() && response.status != StatusCodes.NotFound) { + if(response.status == StatusCodes.NotFound) { + Unmarshal(HttpEntity.Empty: ResponseEntity) + } else if(response.status.isFailure()) { throw new Exception("Http status is failure " + response.status) } else { Unmarshal(response.entity.transformDataBytes(decryptionFlow)) -- cgit v1.2.3