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:36:01 UTC
svn commit: r949894 - 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:36:01 2010
New Revision: 949894
URL: http://svn.apache.org/viewvc?rev=949894&view=rev
Log:
merging r882734 from solr/branches/branch-1.5-dev for SOLR-1582
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/DocumentBuilder.java
Propchange: lucene/solr/branches/branch-1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 23:36:01 2010
@@ -1 +1 @@
-/lucene/solr/trunk:881642,881906,882838,883178,883388,883566,884393,891596,891889,898119,903271,909705,911245,919871,925898
+/lucene/solr/trunk:881642,881906,882734,882838,883178,883388,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=949894&r1=949893&r2=949894&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/CHANGES.txt (original)
+++ lucene/solr/branches/branch-1.4/CHANGES.txt Mon May 31 23:36:01 2010
@@ -104,6 +104,8 @@ Bug Fixes
* SOLR-1579: Fixes to XML escaping in stats.jsp
(David Bowen and hossman)
+* SOLR-1582: copyField was ignored for BinaryField types (gsingers)
+
================== 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:36:01 2010
@@ -1 +1 @@
-/lucene/solr/trunk/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java:881642,881906,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,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:36:01 2010
@@ -1 +1 @@
-/lucene/solr/trunk/src/java/org/apache/solr/handler/DumpRequestHandler.java:881642,881906,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,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:36:01 2010
@@ -1 +1 @@
-/lucene/solr/trunk/src/java/org/apache/solr/handler/MoreLikeThisHandler.java:881642,881906,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,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:36:01 2010
@@ -1,2 +1,2 @@
-/lucene/solr/trunk/src/java/org/apache/solr/request/RawResponseWriter.java:881642,881906,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,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/DocumentBuilder.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/java/org/apache/solr/update/DocumentBuilder.java?rev=949894&r1=949893&r2=949894&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/src/java/org/apache/solr/update/DocumentBuilder.java (original)
+++ lucene/solr/branches/branch-1.4/src/java/org/apache/solr/update/DocumentBuilder.java Mon May 31 23:36:01 2010
@@ -267,7 +267,7 @@ public class DocumentBuilder {
if (isBinaryField) {
if (destinationField.getType() instanceof BinaryField) {
BinaryField binaryField = (BinaryField) destinationField.getType();
- binaryField.createField(destinationField, v, boost);
+ f = binaryField.createField(destinationField, v, boost);
}
} else {
f = destinationField.createField(cf.getLimitedValue(val), boost);