projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9fea1c7
)
4924: Collapse JSON rescue blocks to reduce duplicate code.
author
Peter Amstutz <peter.amstutz@curoverse.com>
Mon, 12 Jan 2015 18:38:45 +0000
(13:38 -0500)
committer
Peter Amstutz <peter.amstutz@curoverse.com>
Mon, 12 Jan 2015 18:38:45 +0000
(13:38 -0500)
sdk/cli/bin/arv
patch
|
blob
|
history
diff --git
a/sdk/cli/bin/arv
b/sdk/cli/bin/arv
index 8aebc5f8bc35fe3317ff715a885d52e58d168736..a142dba10f0816d7ee9b2ce323c7fff96ec360ac 100755
(executable)
--- a/
sdk/cli/bin/arv
+++ b/
sdk/cli/bin/arv
@@
-263,9
+263,7
@@
end
def check_response result
begin
results = JSON.parse result.body
- rescue JSON::ParserError => e
- raise "Failed to parse server response:\n" + e.to_s
- rescue Oj::ParseError => e
+ rescue JSON::ParserError, Oj::ParseError => e
raise "Failed to parse server response:\n" + e.to_s
end