fankes/moshi
2
0
Fork 0
mirror of https://github.com/fankes/moshi.git synced 2025-10-19 16:09:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #168 from square/jw/cause

Browse Source 
Propagate adapter method exception cause.
This commit is contained in:
Jesse Wilson
2016-06-06 09:08:47 -07:00
parent a9d73f27d8 d5c646f93e
commit 6d54252527
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
moshi/src/main/java/com/squareup/moshi/AdapterMethodsFactory.java
View File

@@ -64,8 +64,9 @@ final class AdapterMethodsFactory implements JsonAdapter.Factory {
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
throw new AssertionError(); throw new AssertionError();
} catch (InvocationTargetException e) { } catch (InvocationTargetException e) {
if (e.getCause() instanceof IOException) throw (IOException) e.getCause(); Throwable cause = e.getCause();
throw new JsonDataException(e.getCause() + " at " + writer.getPath()); if (cause instanceof IOException) throw (IOException) cause;
throw new JsonDataException(cause + " at " + writer.getPath(), cause);
} }
} }
} }
@@ -82,8 +83,9 @@ final class AdapterMethodsFactory implements JsonAdapter.Factory {
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
throw new AssertionError(); throw new AssertionError();
} catch (InvocationTargetException e) { } catch (InvocationTargetException e) {
if (e.getCause() instanceof IOException) throw (IOException) e.getCause(); Throwable cause = e.getCause();
throw new JsonDataException(e.getCause() + " at " + reader.getPath()); if (cause instanceof IOException) throw (IOException) cause;
throw new JsonDataException(cause + " at " + reader.getPath(), cause);
} }
} }
} }