You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ho...@apache.org on 2008/12/20 21:03:31 UTC
svn commit: r728336 - in /lucene/solr/trunk: ./
contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/
src/common/org/apache/solr/common/util/ src/java/org/apache/solr/core/
src/java/org/apache/solr/update/
Author: hossman
Date: Sat Dec 20 12:03:30 2008
New Revision: 728336
URL: http://svn.apache.org/viewvc?rev=728336&view=rev
Log:
SOLR-924: Code cleanup: make all existing finalize() methods call super.finalize() in a finally block
Modified:
lucene/solr/trunk/CHANGES.txt
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
lucene/solr/trunk/src/common/org/apache/solr/common/util/ConcurrentLRUCache.java
lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java
lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java
lucene/solr/trunk/src/java/org/apache/solr/update/SolrIndexWriter.java
Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=728336&r1=728335&r2=728336&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Sat Dec 20 12:03:30 2008
@@ -223,6 +223,10 @@
10. SOLR-900: Moved solrj into /src/solrj. The contents of solr-common.jar is now included
in the solr-solrj.jar. (ryan)
+11. SOLR-924: Code cleanup: make all existing finalize() methods call
+ super.finalize() in a finally block. All current instances extend
+ Object, so this doesn't fix any bugs, but helps protect against
+ future changes. (Kay Kay via hossman)
Build
----------------------
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java?rev=728336&r1=728335&r2=728336&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java Sat Dec 20 12:03:30 2008
@@ -335,10 +335,11 @@
}
}
- protected void finalize() {
+ protected void finalize() throws Throwable {
try {
conn.close();
- } catch (Exception e) {
+ } finally {
+ super.finalize();
}
}
Modified: lucene/solr/trunk/src/common/org/apache/solr/common/util/ConcurrentLRUCache.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/common/org/apache/solr/common/util/ConcurrentLRUCache.java?rev=728336&r1=728335&r2=728336&view=diff
==============================================================================
--- lucene/solr/trunk/src/common/org/apache/solr/common/util/ConcurrentLRUCache.java (original)
+++ lucene/solr/trunk/src/common/org/apache/solr/common/util/ConcurrentLRUCache.java Sat Dec 20 12:03:30 2008
@@ -530,6 +530,10 @@
}
protected void finalize() throws Throwable {
- destroy();
+ try {
+ destroy();
+ } finally {
+ super.finalize();
+ }
}
}
Modified: lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java?rev=728336&r1=728335&r2=728336&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java Sat Dec 20 12:03:30 2008
@@ -261,8 +261,12 @@
}
@Override
- protected void finalize() {
- shutdown();
+ protected void finalize() throws Throwable {
+ try {
+ shutdown();
+ } finally {
+ super.finalize();
+ }
}
/**
Modified: lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java?rev=728336&r1=728335&r2=728336&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java Sat Dec 20 12:03:30 2008
@@ -741,9 +741,14 @@
return refCount.get() <= 0;
}
- protected void finalize() {
- if (getOpenCount() != 0) {
- log.error("REFCOUNT ERROR: unreferenced " + this + " (" + getName() + ") has a reference count of " + getOpenCount());
+ protected void finalize() throws Throwable {
+ try {
+ if (getOpenCount() != 0) {
+ log.error("REFCOUNT ERROR: unreferenced " + this + " (" + getName()
+ + ") has a reference count of " + getOpenCount());
+ }
+ } finally {
+ super.finalize();
}
}
Modified: lucene/solr/trunk/src/java/org/apache/solr/update/SolrIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/update/SolrIndexWriter.java?rev=728336&r1=728335&r2=728336&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/update/SolrIndexWriter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/update/SolrIndexWriter.java Sat Dec 20 12:03:30 2008
@@ -198,11 +198,13 @@
}
@Override
- protected void finalize() {
+ protected void finalize() throws Throwable {
try {
super.close();
- } catch (IOException e) {
+ } finally {
+ super.finalize();
}
+
}
}