Commit 7137ca37 authored by Max Kellermann's avatar Max Kellermann

Merge branch 'v0.20.x'

parents fe2f7a3e 282859a6
/*
* 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>
......@@ -38,7 +39,7 @@ namespace Java {
/**
* Wrapper for a local "jclass" reference.
*/
class Class : public Java::LocalRef<jclass> {
class Class : public LocalRef<jclass> {
public:
Class(JNIEnv *env, jclass cls)
:LocalRef<jclass>(env, cls) {}
......@@ -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);
......
/*
* Copyright (C) 2010-2011 Max Kellermann <max.kellermann@gmail.com>
* Copyright 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
......
/*
* Copyright (C) 2010-2011 Max Kellermann <max.kellermann@gmail.com>
* Copyright 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
......@@ -34,7 +34,6 @@
#include <jni.h>
#include <assert.h>
#include <stddef.h>
namespace Java {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment