Skip to content
Browse files

Merge branch 'nafg_nonfatal' into nafg_wip_scala210

  • Loading branch information...
2 parents 92587c7 + ad42579 commit 5a6811115d276ee0bb5c1f6e61e6c591de7ecb3f @nafg nafg committed
View
2 core/json/src/main/scala/net/liftweb/json/JsonParser.scala
@@ -237,7 +237,7 @@ object JsonParser {
unquote(buf)
} catch {
case p: ParseException => throw p
- case _ => fail("unexpected string end")
+ case _: Exception => fail("unexpected string end")
}
def parseValue(first: Char) = {
View
2 core/util/src/main/scala/net/liftweb/util/CssSel.scala
@@ -908,4 +908,4 @@ final case class ToCssBindPromoter(stringSelector: Box[String], css: Box[CssSele
* @return the function that will transform an incoming DOM based on the transform rules
*/
def replaceWith[T](it: => T)(implicit computer: ComputeTransformRules[T]): CssSel = this.#>(it)(computer)
-}
+}
View
2 core/util/src/main/scala/net/liftweb/util/TimeHelpers.scala
@@ -432,7 +432,7 @@ trait TimeHelpers { self: ControlHelpers =>
case o => toDate(o.toString)
}
} catch {
- case e => logger.debug("Error parsing date "+in, e); Failure("Bad date: "+in, Full(e), Empty)
+ case e: Exception => logger.debug("Error parsing date "+in, e); Failure("Bad date: "+in, Full(e), Empty)
}
}
}
View
2 persistence/mapper/src/main/scala/net/liftweb/mapper/FieldFinder.scala
@@ -83,7 +83,7 @@ class FieldFinder[T: ClassManifest](metaMapper: AnyRef, logger: net.liftweb.comm
}
} catch {
- case e =>
+ case e: Exception =>
logger.debug("Not a valid mapped field: %s, got exception: %s".format(meth.getName, e))
false
}

0 comments on commit 5a68111

Please sign in to comment.
Something went wrong with that request. Please try again.