You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2016/06/17 22:20:01 UTC
[2/4] lucene-solr:branch_5_5: SOLR-9053: Fix attribution,
apply the code refactor part from mdrob's patch (cherry picked from
commit b6f8c65)
SOLR-9053: Fix attribution, apply the code refactor part from mdrob's patch
(cherry picked from commit b6f8c65)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/dacb226a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/dacb226a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/dacb226a
Branch: refs/heads/branch_5_5
Commit: dacb226a2be822abe7d46a6be7811c6eeb5f5e4c
Parents: 931501c
Author: Jan H�ydahl <ja...@apache.org>
Authored: Wed May 4 23:19:55 2016 +0200
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 17 18:18:49 2016 -0400
----------------------------------------------------------------------
.../apache/solr/servlet/SolrRequestParsers.java | 28 +++++++++-----------
1 file changed, 12 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/dacb226a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
index 79c151b..7670254 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
@@ -55,7 +55,6 @@ import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryRequestBase;
-import org.apache.solr.util.RTimer;
import org.apache.solr.util.RTimerTree;
import static org.apache.solr.common.params.CommonParams.PATH;
@@ -561,21 +560,18 @@ public class SolrRequestParsers
upload.setSizeMax( ((long) uploadLimitKB) * 1024L );
// Parse the request
- List items = upload.parseRequest(req);
- Iterator iter = items.iterator();
- while (iter.hasNext()) {
- FileItem item = (FileItem) iter.next();
-
- // If it's a form field, put it in our parameter map
- if (item.isFormField()) {
- MultiMapSolrParams.addParam(
- item.getFieldName().trim(),
- item.getString(), params.getMap() );
- }
- // Add the stream
- else {
- streams.add( new FileItemContentStream( item ) );
- }
+ List<FileItem> items = upload.parseRequest(req);
+ for (FileItem item : items) {
+ // If it's a form field, put it in our parameter map
+ if (item.isFormField()) {
+ MultiMapSolrParams.addParam(
+ item.getFieldName().trim(),
+ item.getString(), params.getMap() );
+ }
+ // Add the stream
+ else {
+ streams.add( new FileItemContentStream( item ) );
+ }
}
return params;
}