You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2016/05/04 21:22:32 UTC
lucene-solr:branch_6x: SOLR-9053: Fix attribution,
apply the code refactor part from mdrob's patch (cherry picked from
commit b6f8c65)
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 13832b4f8 -> b6b6d246a
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/b6b6d246
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b6b6d246
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b6b6d246
Branch: refs/heads/branch_6x
Commit: b6b6d246aea9fff5208d035be8afc01b6d686608
Parents: 13832b4
Author: Jan H�ydahl <ja...@apache.org>
Authored: Wed May 4 23:19:55 2016 +0200
Committer: Jan H�ydahl <ja...@apache.org>
Committed: Wed May 4 23:22:16 2016 +0200
----------------------------------------------------------------------
solr/CHANGES.txt | 2 +-
.../apache/solr/servlet/SolrRequestParsers.java | 28 +++++++++-----------
2 files changed, 13 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b6b6d246/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7fabc61..039bf3d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -207,7 +207,7 @@ Other Changes
* SOLR-9047: zkcli should allow alternative locations for log4j configuration (Gregory Chanan)
-* SOLR-9053: Upgrade commons-fileupload to 1.3.1, fixing a potential vulnerability (Jeff Field, janhoy)
+* SOLR-9053: Upgrade commons-fileupload to 1.3.1, fixing a potential vulnerability (Jeff Field, Mike Drob via janhoy)
* SOLR-9066 Make CountMetric return long instead of double (Kevin Risden)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b6b6d246/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 a91f6a2..9d7e7d9 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
@@ -57,7 +57,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;
@@ -564,21 +563,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;
}