Unified Diff: libadblockplus-android/jni/JniCallbacks.cpp
Issue 29424615:
Issue 4231 - Fix unstable FilterEngineTest.testSetRemoveFilterChangeCallback (Closed)
Patch Set: changed impl for reading file as bytes array, modified test. AndroidFileSystem now does not resolve…
Created May 29, 2017, 11:26 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« libadblockplus-android/jni/JniCallbacks.h ('K')
|
« libadblockplus-android/jni/JniCallbacks.h ('k')
|
libadblockplus-android/jni/JniFileSystem.h » ('j')
|
libadblockplus-android/jni/JniFileSystem.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: libadblockplus-android/jni/JniCallbacks.cpp |
| diff --git a/libadblockplus-android/jni/JniCallbacks.cpp b/libadblockplus-android/jni/JniCallbacks.cpp |
| index cf46898426ce9af64a8fec5cc392b1c490fd9c24..3191549f44d2141e1cdc87a8fea9fde7f43afa53 100644 |
| --- a/libadblockplus-android/jni/JniCallbacks.cpp |
| +++ b/libadblockplus-android/jni/JniCallbacks.cpp |
| @@ -55,12 +55,15 @@ void JniCallbackBase::LogException(JNIEnv* env, jthrowable throwable) const |
| } |
| } |
| -void JniCallbackBase::CheckAndLogJavaException(JNIEnv* env) const |
| +bool JniCallbackBase::CheckAndLogJavaException(JNIEnv* env) const |
|
sergei
2017/08/07 12:49:59
Is it an unrelated change?
|
| { |
| if (env->ExceptionCheck()) |
| { |
| JniLocalReference<jthrowable> throwable(env, env->ExceptionOccurred()); |
| env->ExceptionClear(); |
| LogException(env, *throwable); |
| + |
| + return true; |
| } |
| + return false; |
| } |
