svn commit: r1053583 - in /lucene/dev/branches/branch_3x/solr: ./ src/solrj/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java

[ry...@apache.org]

Author: ryan
Date: Wed Dec 29 09:38:12 2010
New Revision: 1053583

URL: http://svn.apache.org/viewvc?rev=1053583&view=rev
Log:
SOLR-2302 -- only show an error if neither a field name nor a field type are sent (merged from trunk)

Modified:
    lucene/dev/branches/branch_3x/solr/   (props changed)
    lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java

Modified: lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java?rev=1053583&r1=1053582&r2=1053583&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java Wed Dec 29 09:38:12 2010
@@ -96,8 +96,8 @@ public class FieldAnalysisRequest extend
    */
   @Override
   public FieldAnalysisResponse process(SolrServer server) throws SolrServerException, IOException {
-    if (fieldTypes == null || fieldNames == null) {
-      throw new IllegalStateException("A list one field type or field name need to be specified");
+    if (fieldTypes == null && fieldNames == null) {
+      throw new IllegalStateException("At least one field type or field name need to be specified");
     }
     if (fieldValue == null) {
       throw new IllegalStateException("The field value must be set");