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 yo...@apache.org on 2009/11/23 23:10:41 UTC
svn commit: r883518 - in /lucene/solr/trunk: CHANGES.txt
src/java/org/apache/solr/update/SolrIndexWriter.java
Author: yonik
Date: Mon Nov 23 22:10:41 2009
New Revision: 883518
URL: http://svn.apache.org/viewvc?rev=883518&view=rev
Log:
SOLR-1595: make rollback set isClosed
Modified:
lucene/solr/trunk/CHANGES.txt
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=883518&r1=883517&r2=883518&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Mon Nov 23 22:10:41 2009
@@ -82,6 +82,12 @@
matching. This change requires reindexing for any content with
such characters. (Robert Muir, yonik)
+* SOLR-1595: A rollback operation followed by the shutdown of Solr
+ or the close of a core resulted in a warning:
+ "SEVERE: SolrIndexWriter was not closed prior to finalize()" although
+ there were no other consequences. (yonik)
+
+
Other Changes
----------------------
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=883518&r1=883517&r2=883518&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 Mon Nov 23 22:10:41 2009
@@ -223,7 +223,7 @@
* }
* ****
*/
- private boolean isClosed = false;
+ private volatile boolean isClosed = false;
public void close() throws IOException {
log.debug("Closing Writer " + name);
try {
@@ -237,6 +237,15 @@
}
@Override
+ public void rollback() throws IOException {
+ try {
+ super.rollback();
+ } finally {
+ isClosed = true;
+ }
+ }
+
+ @Override
protected void finalize() throws Throwable {
try {
if(!isClosed){