Add missing null handling:

#325
haskell · Jan 15, 2016 · c1a7cad · c1a7cad
1 parent 81f8fb5
commit c1a7cad
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Data/Aeson/Types/Instances.hs b/Data/Aeson/Types/Instances.hs
@@ -1613,9 +1613,10 @@ obj .: key = case H.lookup key obj of
 -- value are mandatory, use '.:' instead.
 (.:?) :: (FromJSON a) => Object -> Text -> Parser (Maybe a)
 obj .:? key = case H.lookup key obj of
-               Nothing -> pure Nothing
-               Just v  -> modifyFailure addKeyName
-                        $ parseJSON v <?> Key key
+               Nothing   -> pure Nothing
+               Just Null -> pure Nothing
+               Just v    -> modifyFailure addKeyName
+                         $ Just <$> parseJSON v <?> Key key
   where
     addKeyName = (("failed to parse field " <> unpack key <> ": ") <>)
 {-# INLINE (.:?) #-}