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 2010/06/01 01:43:27 UTC

svn commit: r949897 - in /lucene/solr/branches/branch-1.4: ./ src/java/org/apache/solr/handler/ src/java/org/apache/solr/request/ src/java/org/apache/solr/update/

Author: hossman
Date: Mon May 31 23:43:26 2010
New Revision: 949897

URL: http://svn.apache.org/viewvc?rev=949897&view=rev
Log:
merging r883518 from solr/branches/branch-1.5-dev for SOLR-1596

Modified:
    lucene/solr/branches/branch-1.4/   (props changed)
    lucene/solr/branches/branch-1.4/CHANGES.txt
    lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java   (props changed)
    lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/DumpRequestHandler.java   (props changed)
    lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/MoreLikeThisHandler.java   (props changed)
    lucene/solr/branches/branch-1.4/src/java/org/apache/solr/request/RawResponseWriter.java   (props changed)
    lucene/solr/branches/branch-1.4/src/java/org/apache/solr/update/SolrIndexWriter.java

Propchange: lucene/solr/branches/branch-1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 23:43:26 2010
@@ -1 +1 @@
-/lucene/solr/trunk:881642,881906,882734,882838,883178,883388,883566,884393,891596,891889,898119,903271,909705,911245,919871,925898
+/lucene/solr/trunk:881642,881906,882734,882838,883178,883388,883518,883566,884393,891596,891889,898119,903271,909705,911245,919871,925898

Modified: lucene/solr/branches/branch-1.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/CHANGES.txt?rev=949897&r1=949896&r2=949897&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/CHANGES.txt (original)
+++ lucene/solr/branches/branch-1.4/CHANGES.txt Mon May 31 23:43:26 2010
@@ -106,6 +106,11 @@ Bug Fixes
 
 * SOLR-1582: copyField was ignored for BinaryField types (gsingers)
 
+* SOLR-1596: 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)
+
 ================== Release 1.4.0 ==================
 Release Date:  See http://lucene.apache.org/solr for the official release date.
 

Propchange: lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 23:43:26 2010
@@ -1 +1 @@
-/lucene/solr/trunk/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java:881642,881906,882734,882838,883178,883388,883566,884393,891596,891889,898119,903271,906553,909705,911245,919871,925898
+/lucene/solr/trunk/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java:881642,881906,882734,882838,883178,883388,883518,883566,884393,891596,891889,898119,903271,906553,909705,911245,919871,925898

Propchange: lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/DumpRequestHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 23:43:26 2010
@@ -1 +1 @@
-/lucene/solr/trunk/src/java/org/apache/solr/handler/DumpRequestHandler.java:881642,881906,882734,882838,883178,883388,883566,884393,891596,891889,898119,903271,906553,909705,911245,919871,925898
+/lucene/solr/trunk/src/java/org/apache/solr/handler/DumpRequestHandler.java:881642,881906,882734,882838,883178,883388,883518,883566,884393,891596,891889,898119,903271,906553,909705,911245,919871,925898

Propchange: lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 23:43:26 2010
@@ -1 +1 @@
-/lucene/solr/trunk/src/java/org/apache/solr/handler/MoreLikeThisHandler.java:881642,881906,882734,882838,883178,883388,883566,884393,891596,891889,898119,903271,906553,909705,911245,919871,925898
+/lucene/solr/trunk/src/java/org/apache/solr/handler/MoreLikeThisHandler.java:881642,881906,882734,882838,883178,883388,883518,883566,884393,891596,891889,898119,903271,906553,909705,911245,919871,925898

Propchange: lucene/solr/branches/branch-1.4/src/java/org/apache/solr/request/RawResponseWriter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 23:43:26 2010
@@ -1,2 +1,2 @@
-/lucene/solr/trunk/src/java/org/apache/solr/request/RawResponseWriter.java:881642,881906,882734,882838,883178,883388,883566,884393,891596,891889,898119,903271,909705,911245,919871,925898
+/lucene/solr/trunk/src/java/org/apache/solr/request/RawResponseWriter.java:881642,881906,882734,882838,883178,883388,883518,883566,884393,891596,891889,898119,903271,909705,911245,919871,925898
 /lucene/solr/trunk/src/java/org/apache/solr/response/RawResponseWriter.java:906553

Modified: lucene/solr/branches/branch-1.4/src/java/org/apache/solr/update/SolrIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/java/org/apache/solr/update/SolrIndexWriter.java?rev=949897&r1=949896&r2=949897&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/src/java/org/apache/solr/update/SolrIndexWriter.java (original)
+++ lucene/solr/branches/branch-1.4/src/java/org/apache/solr/update/SolrIndexWriter.java Mon May 31 23:43:26 2010
@@ -223,7 +223,7 @@ public class SolrIndexWriter extends Ind
    * }
    * ****
    */
-  private boolean isClosed = false;
+  private volatile boolean isClosed = false;
   public void close() throws IOException {
     log.debug("Closing Writer " + name);
     try {
@@ -237,6 +237,15 @@ public class SolrIndexWriter extends Ind
   }
 
   @Override
+  public void rollback() throws IOException {
+    try {
+      super.rollback();
+    } finally {
+      isClosed = true;
+    }
+  }
+
+  @Override
   protected void finalize() throws Throwable {
     try {
       if(!isClosed){