From f7f858cb076fd950ed5cd99204fd4e76fe91420d Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Wed, 24 Apr 2019 14:44:06 +0200
Subject: [PATCH] android/Context: use DiscardException()
---
src/android/Context.cxx | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/android/Context.cxx b/src/android/Context.cxx
index c8fcd69db..f997706e1 100644
--- a/src/android/Context.cxx
+++ b/src/android/Context.cxx
@@ -19,6 +19,7 @@
#include "Context.hxx"
#include "java/Class.hxx"
+#include "java/Exception.hxx"
#include "java/File.hxx"
#include "fs/AllocatedPath.hxx"
@@ -33,10 +34,8 @@ Context::GetCacheDir(JNIEnv *env) const
assert(method);
jobject file = env->CallObjectMethod(Get(), method);
- if (file == nullptr) {
- env->ExceptionClear();
+ if (Java::DiscardException(env) || file == nullptr)
return nullptr;
- }
return Java::File::ToAbsolutePath(env, file);
}