oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'v0.20.x'

Browse Source
This commit is contained in:
Max Kellermann
2018-08-28 13:27:04 +02:00
parent fe2f7a3e5a 282859a62a
commit 7137ca375a
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/java/Class.hxx
View File

@@ -1,5 +1,5 @@
/* /*
* 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 * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -31,6 +31,7 @@
#define JAVA_CLASS_HXX #define JAVA_CLASS_HXX
#include "Ref.hxx" #include "Ref.hxx"
#include "Exception.hxx"
#include <assert.h> #include <assert.h>
@@ -38,7 +39,7 @@ namespace Java {
/** /**
* Wrapper for a local "jclass" reference. * Wrapper for a local "jclass" reference.
*/ */
class Class : public Java::LocalRef<jclass> { class Class : public LocalRef<jclass> {
public: public:
Class(JNIEnv *env, jclass cls) Class(JNIEnv *env, jclass cls)
:LocalRef<jclass>(env, cls) {} :LocalRef<jclass>(env, cls) {}
@@ -68,10 +69,8 @@ namespace Java {
assert(name != nullptr); assert(name != nullptr);
jclass cls = env->FindClass(name); jclass cls = env->FindClass(name);
if (cls == nullptr) { if (DiscardException(env))
env->ExceptionClear();
return false; return false;
}
Set(env, cls); Set(env, cls);
env->DeleteLocalRef(cls); env->DeleteLocalRef(cls);

2
src/java/String.cxx
View File

@@ -1,5 +1,5 @@
/* /*
* 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 * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions

3
src/java/String.hxx
View File

@@ -1,5 +1,5 @@
/* /*
* 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 * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -34,7 +34,6 @@
#include <jni.h> #include <jni.h>
#include <assert.h>
#include <stddef.h> #include <stddef.h>
namespace Java { namespace Java {