You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kr...@apache.org on 2016/11/03 15:23:41 UTC
[1/2] lucene-solr:jira/solr-8593: SOLR-9720: Fix for JSONWriterTest
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-8593 0188345e8 -> 4275bc712
SOLR-9720: Fix for JSONWriterTest
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/78b768f2
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/78b768f2
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/78b768f2
Branch: refs/heads/jira/solr-8593
Commit: 78b768f2a4d62e191a3a8e1e9d19d6c5058b20e5
Parents: 213a2a1
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:21:13 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/78b768f2/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) {
[2/2] lucene-solr:jira/solr-8593: Merge branch 'apache-https-master'
into jira/solr-8593
Posted by kr...@apache.org.
Merge branch 'apache-https-master' into jira/solr-8593
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4275bc71
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4275bc71
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4275bc71
Branch: refs/heads/jira/solr-8593
Commit: 4275bc7124c8f97a645f479fd1ba3e44ff718cb6
Parents: 0188345 78b768f
Author: Kevin Risden <kr...@apache.org>
Authored: Thu Nov 3 10:23:30 2016 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Thu Nov 3 10:23:30 2016 -0500
----------------------------------------------------------------------
.../src/java/org/apache/solr/response/JSONResponseWriter.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------