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

Side by Side Diff: jni/JniCallbacks.cpp

Issue 5697499218051072: Usage of new API, cleanups (reduced) (Closed)
Patch Set: Even more review issues fixed. Created April 28, 2014, 10:18 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « jni/JniCallbacks.h ('k') | jni/JniFilterChangeCallback.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <http://adblockplus.org/>, 2 * This file is part of Adblock Plus <http://adblockplus.org/>,
3 * Copyright (C) 2006-2014 Eyeo GmbH 3 * Copyright (C) 2006-2014 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
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 #include "JniCallbacks.h" 18 #include "JniCallbacks.h"
19 19
20 JniCallbackBase::JniCallbackBase(JNIEnv* env, jobject callbackObject) 20 JniCallbackBase::JniCallbackBase(JNIEnv* env, jobject callbackObject)
21 : callbackObject(new JniGlobalReference<jobject>(env, callbackObject)),
22 exceptionLoggerClass(new JniGlobalReference<jclass>(env, env->FindClass(PKG( "JniExceptionHandler"))))
21 { 23 {
22 env->GetJavaVM(&javaVM); 24 env->GetJavaVM(&javaVM);
23 this->callbackObject.reset(new JniGlobalReference<jobject>(env, callbackObject ));
24 exceptionLoggerClass.reset(new JniGlobalReference<jclass>(env, env->FindClass( PKG("JniExceptionHandler"))));
25 } 25 }
26 26
27 JniCallbackBase::~JniCallbackBase() 27 JniCallbackBase::~JniCallbackBase()
28 { 28 {
29 29
30 } 30 }
31 31
32 void JniCallbackBase::LogException(JNIEnv* env, jthrowable throwable) const 32 void JniCallbackBase::LogException(JNIEnv* env, jthrowable throwable) const
33 { 33 {
34 jmethodID logMethod = env->GetStaticMethodID(exceptionLoggerClass->Get(), "log Exception", "(Ljava/lang/Throwable;)V"); 34 jmethodID logMethod = env->GetStaticMethodID(exceptionLoggerClass->Get(), "log Exception", "(Ljava/lang/Throwable;)V");
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 jthrowable throwable = env->ExceptionOccurred();
46 env->ExceptionClear(); 46 env->ExceptionClear();
47 LogException(env, throwable); 47 LogException(env, throwable);
48 } 48 }
49 } 49 }
OLDNEW
« no previous file with comments | « jni/JniCallbacks.h ('k') | jni/JniFilterChangeCallback.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld