git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
30b9740
)
JAL-2216 finalize call super.finalize()
author
gmungoc
<g.m.carstairs@dundee.ac.uk>
Thu, 22 Sep 2016 13:50:53 +0000
(14:50 +0100)
committer
gmungoc
<g.m.carstairs@dundee.ac.uk>
Thu, 22 Sep 2016 13:50:53 +0000
(14:50 +0100)
src/jalview/javascript/JSFunctionExec.java
patch
|
blob
|
history
diff --git
a/src/jalview/javascript/JSFunctionExec.java
b/src/jalview/javascript/JSFunctionExec.java
index
4d7c0d4
..
6daf275
100644
(file)
--- a/
src/jalview/javascript/JSFunctionExec.java
+++ b/
src/jalview/javascript/JSFunctionExec.java
@@
-39,7
+39,8
@@
public class JSFunctionExec implements Runnable
jvlite.setExecutor(this);
}
jvlite.setExecutor(this);
}
- public void finalize()
+ @Override
+ protected void finalize() throws Throwable
{
jvlite = null;
executor = null;
{
jvlite = null;
executor = null;
@@
-48,6
+49,7
@@
public class JSFunctionExec implements Runnable
jsExecQueue.clear();
}
jsExecQueue = null;
jsExecQueue.clear();
}
jsExecQueue = null;
+ super.finalize();
}
private Vector jsExecQueue;
}
private Vector jsExecQueue;
@@
-82,6
+84,7
@@
public class JSFunctionExec implements Runnable
executor = null;
}
executor = null;
}
+ @Override
public void run()
{
while (jsExecQueue != null)
public void run()
{
while (jsExecQueue != null)
@@
-164,6
+167,7
@@
public class JSFunctionExec implements Runnable
final Exception[] jsex = new Exception[1];
Runnable exec = new Runnable()
{
final Exception[] jsex = new Exception[1];
Runnable exec = new Runnable()
{
+ @Override
public void run()
{
try
public void run()
{
try
@@
-196,7
+200,7
@@
public class JSFunctionExec implements Runnable
if (jex instanceof netscape.javascript.JSException
&& jvlite.jsfallbackEnabled)
{
if (jex instanceof netscape.javascript.JSException
&& jvlite.jsfallbackEnabled)
{
- jsex[0] = (netscape.javascript.JSException) jex;
+ jsex[0] = jex;
if (jvlite.debug)
{
System.err.println("Falling back to javascript: url call");
if (jvlite.debug)
{
System.err.println("Falling back to javascript: url call");