Unify case style as per @farmdawgnation suggestion

lift · Sep 15, 2017 · 7bea36b · 7bea36b
1 parent a02ad7e
commit 7bea36b
Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/web/webkit/src/main/scala/net/liftweb/builtin/snippet/Embed.scala b/web/webkit/src/main/scala/net/liftweb/builtin/snippet/Embed.scala
@@ -79,13 +79,12 @@ object Embed extends DispatchSnippet {
 
       bindFn(template)
     }
-    case Failure(msg, ex, _) =>
-      ex match {
-        case Full(e) =>
-          logger.error("'embed' snippet failed with message: "+msg, e)
-        case _ =>
-          logger.error("'embed' snippet failed with message: "+msg)
-      }
+    case Failure(msg, Full(ex), _) =>
+      logger.error("'embed' snippet failed with message: "+msg, ex)
+      throw new SnippetExecutionException("Embed Snippet failed: "+msg)
+
+    case Failure(msg, _, _) =>
+      logger.error("'embed' snippet failed with message: "+msg)
       throw new SnippetExecutionException("Embed Snippet failed: "+msg)
 
     case _ =>

diff --git a/web/webkit/src/main/scala/net/liftweb/http/LiftSession.scala b/web/webkit/src/main/scala/net/liftweb/http/LiftSession.scala
@@ -2106,11 +2106,8 @@ class LiftSession(private[http] val _contextPath: String, val underlyingId: Stri
           in.!(xlate(p) match {
             case Full(v) => v
             case Empty => logger.error("Failed to deserialize JSON message "+p); p
-            case Failure(msg, ex, _) => ex match {
-              case Full(e) => logger.error("Failed to deserialize JSON message "+p+". Error "+msg, e)
-              case _ => logger.error("Failed to deserialize JSON message "+p+". Error "+msg)
-            }
-              p
+            case Failure(msg, Full(ex), _) => logger.error("Failed to deserialize JSON message "+p+". Error "+msg, ex); p
+            case Failure(msg, _, _) => logger.error("Failed to deserialize JSON message "+p+". Error "+msg); p
           })
           JsCmds.Noop
         }).cmd)