This is an automated email from the ASF dual-hosted git repository. dubeejw pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git
The following commit(s) were added to refs/heads/master by this push: new d13ff86 Fix error message type (#3595) d13ff86 is described below commit d13ff868617827a52c487ddc962f01d4a64dd91b Author: James Dubee <jwdu...@us.ibm.com> AuthorDate: Mon Apr 30 17:35:48 2018 -0400 Fix error message type (#3595) --- common/scala/src/main/scala/whisk/core/entity/WhiskActivation.scala | 4 ++-- tests/src/test/scala/common/WskTestHelpers.scala | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/scala/src/main/scala/whisk/core/entity/WhiskActivation.scala b/common/scala/src/main/scala/whisk/core/entity/WhiskActivation.scala index 8c18a98..891aa20 100644 --- a/common/scala/src/main/scala/whisk/core/entity/WhiskActivation.scala +++ b/common/scala/src/main/scala/whisk/core/entity/WhiskActivation.scala @@ -151,9 +151,9 @@ object WhiskActivation value match { case JsString(t) => Instant.parse(t) case JsNumber(i) => Instant.ofEpochMilli(i.bigDecimal.longValue) - case _ => deserializationError("timetsamp malformed") + case _ => deserializationError("timestamp malformed") } - } getOrElse deserializationError("timetsamp malformed") + } getOrElse deserializationError("timestamp malformed") } override val collectionName = "activations" diff --git a/tests/src/test/scala/common/WskTestHelpers.scala b/tests/src/test/scala/common/WskTestHelpers.scala index 7c948bf..7582b81 100644 --- a/tests/src/test/scala/common/WskTestHelpers.scala +++ b/tests/src/test/scala/common/WskTestHelpers.scala @@ -84,9 +84,9 @@ object ActivationResult extends DefaultJsonProtocol { Try { value match { case JsNumber(i) => Instant.ofEpochMilli(i.bigDecimal.longValue) - case _ => deserializationError("timetsamp malformed") + case _ => deserializationError("timestamp malformed") } - } getOrElse deserializationError("timetsamp malformed 2") + } getOrElse deserializationError("timestamp malformed 2") } implicit val serdes = new RootJsonFormat[ActivationResult] { -- To stop receiving notification emails like this one, please contact dube...@apache.org.