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/12/03 20:43:26 UTC
svn commit: r1041967 -
/lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/CSVRequestHandler.java
Author: yonik
Date: Fri Dec 3 19:43:26 2010
New Revision: 1041967
URL: http://svn.apache.org/viewvc?rev=1041967&view=rev
Log:
SOLR-2264: CSVRequestHandler can throw NPE when no escape parameter is specified for splitting
Modified:
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/CSVRequestHandler.java
Modified: lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/CSVRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/CSVRequestHandler.java?rev=1041967&r1=1041966&r2=1041967&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/CSVRequestHandler.java (original)
+++ lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/CSVRequestHandler.java Fri Dec 3 19:43:26 2010
@@ -54,17 +54,17 @@ public class CSVRequestHandler extends C
@Override
public String getVersion() {
- return "$Revision:$";
+ return "$Revision$";
}
@Override
public String getSourceId() {
- return "$Id:$";
+ return "$Id$";
}
@Override
public String getSource() {
- return "$URL:$";
+ return "$URL$";
}
}
@@ -307,7 +307,7 @@ abstract class CSVLoader extends Content
String encStr = params.getFieldParam(fname,ENCAPSULATOR);
char fenc = encStr==null || encStr.length()==0 ? (char)-2 : encStr.charAt(0);
String escStr = params.getFieldParam(fname,ESCAPE);
- char fesc = escStr==null || encStr.length()==0 ? CSVStrategy.ESCAPE_DISABLED : escStr.charAt(0);
+ char fesc = escStr==null || escStr.length()==0 ? CSVStrategy.ESCAPE_DISABLED : escStr.charAt(0);
CSVStrategy fstrat = new CSVStrategy(fsep,fenc,CSVStrategy.COMMENTS_DISABLED,fesc, false, false, false, false);
adders[i] = new CSVLoader.FieldSplitter(fstrat, adders[i]);