summaryrefslogtreecommitdiff
path: root/bridges
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-11-11 15:35:08 +0200
committerNoel Grandin <noelgrandin@gmail.com>2014-11-12 08:02:18 +0000
commitb95dcb97de986a1e7dd7f7fda258e559f8d60b1c (patch)
tree58442e1ad7bdf30eb0a6e7c673f56355939f059f /bridges
parent36ff1527c9cb20542d3097d123d221c40a356795 (diff)
java: last statement in finalize() method should be call to super.finalize()
Change-Id: I1785c6cef1fe7c1990207a76c263cff388cbb7e1 Reviewed-on: https://gerrit.libreoffice.org/12375 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'bridges')
-rw-r--r--bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java3
-rw-r--r--bridges/test/java_remote/Bug108825_Test.java3
2 files changed, 4 insertions, 2 deletions
diff --git a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
index 1c2b691bb3a1..e129f1032702 100644
--- a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
+++ b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
@@ -51,9 +51,10 @@ public final class JNI_info_holder
private native void finalize( long jni_info_handle );
@Override
- protected void finalize()
+ protected void finalize() throws Throwable
{
finalize( s_jni_info_handle );
+ super.finalize();
}
}
diff --git a/bridges/test/java_remote/Bug108825_Test.java b/bridges/test/java_remote/Bug108825_Test.java
index e4343c55fcdb..182ae35abad3 100644
--- a/bridges/test/java_remote/Bug108825_Test.java
+++ b/bridges/test/java_remote/Bug108825_Test.java
@@ -88,10 +88,11 @@ public final class Bug108825_Test extends ComplexTestCase {
private final class Dummy implements XDummy {
@Override
- protected void finalize() {
+ protected void finalize() throws Throwable {
synchronized (lock) {
++finalizedCount;
}
+ super.finalize();
}
}