Side by Side Diff: jni/JniCallbacks.cpp
Issue 4761138508070912:
Issue 1848 - Clean up local reference handling (Closed)
Patch Set: Formatting, explicit, unrelated change
Created Feb. 3, 2015, 1:51 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
jni/JniEventCallback.cpp » ('j')
|
jni/JniUpdateCheckDoneCallback.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
| 3 * Copyright (C) 2006-2015 Eyeo GmbH | 3 * Copyright (C) 2006-2015 Eyeo GmbH |
| 4 * | 4 * |
| 5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
| 6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
| 7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
| 8 * | 8 * |
| 9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 35 if (logMethod) | 35 if (logMethod) |
| 36 { | 36 { |
| 37 env->CallStaticVoidMethod(exceptionLoggerClass->Get(), logMethod, throwable) ; | 37 env->CallStaticVoidMethod(exceptionLoggerClass->Get(), logMethod, throwable) ; |
| 38 } | 38 } |
| 39 } | 39 } |
| 40 | 40 |
| 41 void JniCallbackBase::CheckAndLogJavaException(JNIEnv* env) const | 41 void JniCallbackBase::CheckAndLogJavaException(JNIEnv* env) const |
| 42 { | 42 { |
| 43 if (env->ExceptionCheck()) | 43 if (env->ExceptionCheck()) |
| 44 { | 44 { |
| 45 jthrowable throwable = env->ExceptionOccurred(); | 45 JniLocalReference<jthrowable> throwable(env, env->ExceptionOccurred()); |
| 46 env->ExceptionClear(); | 46 env->ExceptionClear(); |
| 47 LogException(env, throwable); | 47 LogException(env, *throwable); |
| 48 } | 48 } |
| 49 } | 49 } |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
jni/JniEventCallback.cpp » ('j')
|
jni/JniUpdateCheckDoneCallback.cpp » ('J')
