Skip to content

Commit 7bea36b

Browse files
committed
Unify case style as per @farmdawgnation suggestion
1 parent a02ad7e commit 7bea36b

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

web/webkit/src/main/scala/net/liftweb/builtin/snippet/Embed.scala

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,12 @@ object Embed extends DispatchSnippet {
7979

8080
bindFn(template)
8181
}
82-
case Failure(msg, ex, _) =>
83-
ex match {
84-
case Full(e) =>
85-
logger.error("'embed' snippet failed with message: "+msg, e)
86-
case _ =>
87-
logger.error("'embed' snippet failed with message: "+msg)
88-
}
82+
case Failure(msg, Full(ex), _) =>
83+
logger.error("'embed' snippet failed with message: "+msg, ex)
84+
throw new SnippetExecutionException("Embed Snippet failed: "+msg)
85+
86+
case Failure(msg, _, _) =>
87+
logger.error("'embed' snippet failed with message: "+msg)
8988
throw new SnippetExecutionException("Embed Snippet failed: "+msg)
9089

9190
case _ =>

web/webkit/src/main/scala/net/liftweb/http/LiftSession.scala

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2106,11 +2106,8 @@ class LiftSession(private[http] val _contextPath: String, val underlyingId: Stri
21062106
in.!(xlate(p) match {
21072107
case Full(v) => v
21082108
case Empty => logger.error("Failed to deserialize JSON message "+p); p
2109-
case Failure(msg, ex, _) => ex match {
2110-
case Full(e) => logger.error("Failed to deserialize JSON message "+p+". Error "+msg, e)
2111-
case _ => logger.error("Failed to deserialize JSON message "+p+". Error "+msg)
2112-
}
2113-
p
2109+
case Failure(msg, Full(ex), _) => logger.error("Failed to deserialize JSON message "+p+". Error "+msg, ex); p
2110+
case Failure(msg, _, _) => logger.error("Failed to deserialize JSON message "+p+". Error "+msg); p
21142111
})
21152112
JsCmds.Noop
21162113
}).cmd)

0 commit comments

Comments
 (0)