update any object

vapor · Jan 26, 2016 · 6d4cae6 · 6d4cae6
1 parent 1b9a198
commit 6d4cae6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Sources/Response.swift b/Sources/Response.swift
@@ -180,7 +180,10 @@ public class Response {
         self.init(status: status, data: data, contentType: .Text)
     }
 
-    convenience init(status: Status, jsonObject: AnyObject) throws {
+    convenience init(status: Status, jsonObject: Any) throws {
+        guard let jsonObject = jsonObject as? AnyObject else {
+            throw SerializationError.InvalidObject
+        }
         guard NSJSONSerialization.isValidJSONObject(jsonObject) else {
             throw SerializationError.InvalidObject
         }

diff --git a/Sources/ResponseConvertible.swift b/Sources/ResponseConvertible.swift
@@ -15,7 +15,7 @@ extension String: ResponseConvertible {
 extension Dictionary: ResponseConvertible {
 	public func response() -> Response {
 		do {
-            return try Response(status: .OK, jsonObject: (self as! AnyObject))    
+            return try Response(status: .OK, jsonObject: self)    
         } catch {
             return Response(error: "JSON serialization error: \(error)")
         }