Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: libadblockplus-android/jni/JniCallbacks.cpp

Issue 29424615: Issue 4231 - Fix unstable FilterEngineTest.testSetRemoveFilterChangeCallback (Closed)
Left Patch Set: now using smart_ptr, changed impl for reading file as string, minor changes Created May 22, 2017, 1:03 p.m.
Right 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.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Right: Side by side diff | Download
LEFTRIGHT
(no file at all)
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-2017 eyeo GmbH 3 * Copyright (C) 2006-2017 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 void JniCallbackBase::LogException(JNIEnv* env, jthrowable throwable) const 48 void JniCallbackBase::LogException(JNIEnv* env, jthrowable throwable) const
49 { 49 {
50 jmethodID logMethod = env->GetStaticMethodID( 50 jmethodID logMethod = env->GetStaticMethodID(
51 exceptionHandlerClass->Get(), "logException", "(Ljava/lang/Throwable;)V"); 51 exceptionHandlerClass->Get(), "logException", "(Ljava/lang/Throwable;)V");
52 if (logMethod) 52 if (logMethod)
53 { 53 {
54 env->CallStaticVoidMethod(exceptionHandlerClass->Get(), logMethod, throwable ); 54 env->CallStaticVoidMethod(exceptionHandlerClass->Get(), logMethod, throwable );
55 } 55 }
56 } 56 }
57 57
58 void JniCallbackBase::CheckAndLogJavaException(JNIEnv* env) const 58 bool JniCallbackBase::CheckAndLogJavaException(JNIEnv* env) const
sergei 2017/08/07 12:49:59 Is it an unrelated change?
59 { 59 {
60 if (env->ExceptionCheck()) 60 if (env->ExceptionCheck())
61 { 61 {
62 JniLocalReference<jthrowable> throwable(env, env->ExceptionOccurred()); 62 JniLocalReference<jthrowable> throwable(env, env->ExceptionOccurred());
63 env->ExceptionClear(); 63 env->ExceptionClear();
64 LogException(env, *throwable); 64 LogException(env, *throwable);
65
66 return true;
65 } 67 }
68 return false;
66 } 69 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld