Merge pull request #294 from anakinj/fix-json-conflict-issue

Fix JSON conflict between #293 and #292
jwt · Jan 21, 2019 · 7a9f1b2 · 7a9f1b2
2 parents 73ba6a0 + 39a9224
commit 7a9f1b2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/jwt/decode.rb b/lib/jwt/decode.rb
@@ -92,8 +92,8 @@ def signing_input
     end
 
     def parse_and_decode(segment)
-      JSON.parse(JWT::Base64.url_decode(segment))
-    rescue JSON::ParserError
+      JWT::JSON.parse(JWT::Base64.url_decode(segment))
+    rescue ::JSON::ParserError
       raise JWT::DecodeError, 'Invalid segment encoding'
     end
   end