svn commit: r1041966 - in /lucene/dev/branches/branch_3x: ./ lucene/ solr/ solr/src/java/org/apache/solr/handler/CSVRequestHandler.java

[yo...@apache.org]

Author: yonik
Date: Fri Dec  3 19:36:23 2010
New Revision: 1041966

URL: http://svn.apache.org/viewvc?rev=1041966&view=rev
Log:
SOLR-2264: CSVRequestHandler can throw NPE when no escape parameter is specified for splitting

Modified:
    lucene/dev/branches/branch_3x/   (props changed)
    lucene/dev/branches/branch_3x/lucene/   (props changed)
    lucene/dev/branches/branch_3x/solr/   (props changed)
    lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/CSVRequestHandler.java

Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/CSVRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/CSVRequestHandler.java?rev=1041966&r1=1041965&r2=1041966&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/CSVRequestHandler.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/CSVRequestHandler.java Fri Dec  3 19:36:23 2010
@@ -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]);