You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2016/11/03 14:52:21 UTC

lucene-solr:branch_6x: SOLR-9720: Fix for JSONWriterTest

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x b11e12606 -> 9f9139ab4


SOLR-9720: Fix for JSONWriterTest

(cherry picked from commit 78b768f)


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9f9139ab
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9f9139ab
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9f9139ab

Branch: refs/heads/branch_6x
Commit: 9f9139ab429708916beab22c05312662dbd9eaa1
Parents: b11e126
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Thu Nov 3 20:21:13 2016 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Thu Nov 3 20:22:20 2016 +0530

----------------------------------------------------------------------
 .../src/java/org/apache/solr/response/JSONResponseWriter.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9f9139ab/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java b/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java
index 209481ab..7090348 100644
--- a/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java
@@ -553,7 +553,7 @@ class JSONWriter extends TextResponseWriter {
     writeJsonIter(val);
   }
 
-  protected void writeJsonIter(Iterator val) throws IOException {
+  private void writeJsonIter(Iterator val) throws IOException {
     incLevel();
     boolean first=true;
     while( val.hasNext() ) {
@@ -636,6 +636,11 @@ class ArrayOfNamedValuePairJSONWriter extends JSONWriter {
   }
 
   @Override
+  public void writeArray(String name, List l) throws IOException {
+    writeArray(name, l.iterator());
+  }
+
+  @Override
   public void writeNamedList(String name, NamedList val) throws IOException {
 
     if (val instanceof SimpleOrderedMap) {