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 2010/06/01 18:21:03 UTC
svn commit: r950143 - in /lucene/solr/branches/branch-1.4: ./
src/java/org/apache/solr/handler/ src/java/org/apache/solr/request/
src/solrj/org/apache/solr/client/solrj/impl/
Author: yonik
Date: Tue Jun 1 16:21:03 2010
New Revision: 950143
URL: http://svn.apache.org/viewvc?rev=950143&view=rev
Log:
SOLR-1936: escape U+2028 in JSON responses (merged from trunk)
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/JSONResponseWriter.java
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/request/RawResponseWriter.java (props changed)
lucene/solr/branches/branch-1.4/src/solrj/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java (props changed)
Propchange: lucene/solr/branches/branch-1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 1 16:21:03 2010
@@ -1 +1,2 @@
+/lucene/dev/trunk/solr:950125
/lucene/solr/trunk:881642,881906,882734,882838,883178,883388,883518,883566,884393,890243,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=950143&r1=950142&r2=950143&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/CHANGES.txt (original)
+++ lucene/solr/branches/branch-1.4/CHANGES.txt Tue Jun 1 16:21:03 2010
@@ -114,6 +114,9 @@ Bug Fixes
* SOLR-1651: Fixed Incorrect dataimport handler package name in SolrResourceLoader
(Akshay Ukey via shalin)
+* SOLR-1936: The JSON response format needed to escape unicode code point
+ U+2028 - 'LINE SEPARATOR' (Robert Hofstra, 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 Tue Jun 1 16:21:03 2010
@@ -1 +1,2 @@
+/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java:950125
/lucene/solr/trunk/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java:881642,881906,882734,882838,883178,883388,883518,883566,884393,890243,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 Tue Jun 1 16:21:03 2010
@@ -1 +1,2 @@
+/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/DumpRequestHandler.java:950125
/lucene/solr/trunk/src/java/org/apache/solr/handler/DumpRequestHandler.java:881642,881906,882734,882838,883178,883388,883518,883566,884393,890243,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 Tue Jun 1 16:21:03 2010
@@ -1 +1,2 @@
+/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/MoreLikeThisHandler.java:950125
/lucene/solr/trunk/src/java/org/apache/solr/handler/MoreLikeThisHandler.java:881642,881906,882734,882838,883178,883388,883518,883566,884393,890243,891596,891889,898119,903271,906553,909705,911245,919871,925898
Modified: lucene/solr/branches/branch-1.4/src/java/org/apache/solr/request/JSONResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/java/org/apache/solr/request/JSONResponseWriter.java?rev=950143&r1=950142&r2=950143&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/src/java/org/apache/solr/request/JSONResponseWriter.java (original)
+++ lucene/solr/branches/branch-1.4/src/java/org/apache/solr/request/JSONResponseWriter.java Tue Jun 1 16:21:03 2010
@@ -612,7 +612,7 @@ class JSONWriter extends TextResponseWri
for (int i=0; i<val.length(); i++) {
char ch = val.charAt(i);
- if ((ch > '#' && ch != '\\') || ch==' ') { // fast path
+ if ((ch > '#' && ch != '\\' && ch != '\u2028') || ch==' ') { // fast path
writer.write(ch);
continue;
}
@@ -627,6 +627,7 @@ class JSONWriter extends TextResponseWri
case '\t': writer.write('\\'); writer.write('t'); break;
case '\b': writer.write('\\'); writer.write('b'); break;
case '\f': writer.write('\\'); writer.write('f'); break;
+ case '\u2028': unicodeEscape(writer,ch); break;
// case '/':
default: {
if (ch <= 0x1F) {
Propchange: lucene/solr/branches/branch-1.4/src/java/org/apache/solr/request/RawResponseWriter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 1 16:21:03 2010
@@ -1,2 +1,3 @@
+/lucene/dev/trunk/solr/src/java/org/apache/solr/request/RawResponseWriter.java:950125
/lucene/solr/trunk/src/java/org/apache/solr/request/RawResponseWriter.java:881642,881906,882734,882838,883178,883388,883518,883566,884393,890243,891596,891889,898119,903271,909705,911245,919871,925898
/lucene/solr/trunk/src/java/org/apache/solr/response/RawResponseWriter.java:906553
Propchange: lucene/solr/branches/branch-1.4/src/solrj/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 1 16:21:03 2010
@@ -1 +1,2 @@
+/lucene/dev/trunk/solr/src/solrj/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java:950125
/lucene/solr/trunk/src/solrj/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java:829939-906553,909705,911245,919871,925898