Skip to content
Browse files

Merge branch 'master' into hooks

  • Loading branch information...
2 parents 7817e35 + 53c0741 commit 82c5904e0ac614e9655f947d19ca79d36693dc17 @defunkt defunkt committed Mar 3, 2010
Showing with 9 additions and 3 deletions.
  1. +4 −0 HISTORY.md
  2. +4 −2 lib/resque/helpers.rb
  3. +1 −1 lib/resque/version.rb
View
4 HISTORY.md
@@ -1,3 +1,7 @@
+## 1.5.2 (2010-03-03)
+
+* Bugfix: JSON check was crazy.
+
## 1.5.1 (2010-03-03)
* `Job.destroy` and `Resque.dequeue` return the # of destroyed jobs.
View
6 lib/resque/helpers.rb
@@ -21,12 +21,14 @@ def decode(object)
return unless object
if defined? Yajl
- Yajl::Parser.parse(object, :check_utf8 => false)
+ begin
+ Yajl::Parser.parse(object, :check_utf8 => false)
+ rescue Yajl::ParseError
+ end
else
begin
JSON.parse(object)
rescue JSON::ParserError
- logger.error "#{$!}"
end
end
end
View
2 lib/resque/version.rb
@@ -1,3 +1,3 @@
module Resque
- Version = '1.5.1'
+ Version = '1.5.2'
end

0 comments on commit 82c5904

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