java/Class: use DiscardException() in FindOptional()

Sometimes, the JVM returns a non-nullptr value with an exception pending (seen on Android 1.6, maybe a Dalvik bug?). Let's catch all such cases.

java/Class: use DiscardException() in FindOptional()
85bada05 · Max Kellermann · cf961351 · 85bada05
Commit 85bada05 authored Aug 28, 2018 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

Class.hxx src/java/Class.hxx +3 -4

No files found.
--- a/src/java/Class.hxx
+++ b/src/java/Class.hxx
 /*
- * Copyright (C) 2010-2011 Max Kellermann <max.kellermann@gmail.com>
+ * Copyright (C) 2010-2018 Max Kellermann <max.kellermann@gmail.com>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
@@ -31,6 +31,7 @@
 #define JAVA_CLASS_HXX

 #include "Ref.hxx"
+#include "Exception.hxx"

 #include <assert.h>

@@ -68,10 +69,8 @@ namespace Java {
 			assert(name != nullptr);

 			jclass cls = env->FindClass(name);
-			if (cls == nullptr) {
-				env->ExceptionClear();
+			if (DiscardException(env))
 				return false;
-			}

 			Set(env, cls);
 			env->DeleteLocalRef(cls);