3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-13 12:28:44 +00:00

Bugfix for object finalization in Java API.

Relates to #205 and #245
This commit is contained in:
Christoph M. Wintersteiger 2015-10-14 12:43:09 +01:00
parent 6263252bf5
commit e312b47be6
4 changed files with 40 additions and 14 deletions

View file

@ -33,7 +33,7 @@ public class AST extends Z3Object implements Comparable
{
AST casted = null;
try
try
{
casted = AST.class.cast(o);
} catch (ClassCastException e)
@ -41,13 +41,12 @@ public class AST extends Z3Object implements Comparable
return false;
}
return
(this == casted) ||
(this != null) &&
(casted != null) &&
(getContext().nCtx() == casted.getContext().nCtx()) &&
(Native.isEqAst(getContext().nCtx(), getNativeObject(), casted.getNativeObject()));
}
return (this == casted) ||
(this != null) &&
(casted != null) &&
(getContext().nCtx() == casted.getContext().nCtx()) &&
(Native.isEqAst(getContext().nCtx(), getNativeObject(), casted.getNativeObject()));
}
/**
* Object Comparison.

View file

@ -80,11 +80,20 @@ public class Constructor extends Z3Object
/**
* Destructor.
* @throws Throwable
* @throws Z3Exception on error
**/
protected void finalize()
protected void finalize() throws Throwable
{
Native.delConstructor(getContext().nCtx(), getNativeObject());
try {
Native.delConstructor(getContext().nCtx(), getNativeObject());
}
catch (Throwable t) {
throw t;
}
finally {
super.finalize();
}
}
private int n = 0;

View file

@ -24,11 +24,20 @@ public class ConstructorList extends Z3Object
{
/**
* Destructor.
* @throws Throwable
* @throws Z3Exception on error
**/
protected void finalize()
protected void finalize() throws Throwable
{
Native.delConstructorList(getContext().nCtx(), getNativeObject());
try {
Native.delConstructorList(getContext().nCtx(), getNativeObject());
}
catch (Throwable t) {
throw t;
}
finally {
super.finalize();
}
}
ConstructorList(Context ctx, long obj)

View file

@ -25,10 +25,19 @@ public class Z3Object extends IDisposable
{
/**
* Finalizer.
* @throws Throwable
**/
protected void finalize()
protected void finalize() throws Throwable
{
dispose();
try {
dispose();
}
catch (Throwable t) {
throw t;
}
finally {
super.finalize();
}
}
/**