From a913002f13d8a2faad512ffda6c70f413b8e7ee5 Mon Sep 17 00:00:00 2001 From: Wang Yicun Date: Thu, 4 Mar 2021 17:19:55 +0800 Subject: [PATCH] Simplify code, remove redundant condition 'clazz || (!clazz && isCached)' is equivalent to 'clazz || isCached' Done-with: Tang Peng Pick-to: 6.1 Change-Id: Ie9eab4a94a61be2b360f64980c4666a622f3a209 Reviewed-by: Volker Hilsheimer --- src/corelib/kernel/qjni.cpp | 4 +--- src/corelib/kernel/qjniobject.cpp | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/corelib/kernel/qjni.cpp b/src/corelib/kernel/qjni.cpp index b593483e597..3750fdb9bc4 100644 --- a/src/corelib/kernel/qjni.cpp +++ b/src/corelib/kernel/qjni.cpp @@ -280,9 +280,7 @@ jclass QJNIEnvironmentPrivate::findClass(const char *className, JNIEnv *env) bool isCached = false; jclass clazz = getCachedClass(classDotEnc, &isCached); - const bool found = (clazz != 0) || (clazz == 0 && isCached); - - if (found) + if (clazz || isCached) return clazz; const QLatin1String key(classDotEnc); diff --git a/src/corelib/kernel/qjniobject.cpp b/src/corelib/kernel/qjniobject.cpp index 43840052ae1..f141c2d84e4 100644 --- a/src/corelib/kernel/qjniobject.cpp +++ b/src/corelib/kernel/qjniobject.cpp @@ -467,9 +467,7 @@ jclass QtAndroidPrivate::findClass(const char *className, JNIEnv *env) bool isCached = false; jclass clazz = getCachedClass(classDotEnc, &isCached); - const bool found = clazz || (!clazz && isCached); - - if (found) + if (clazz || isCached) return clazz; const QLatin1String key(classDotEnc);