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 bi...@apache.org on 2007/09/11 16:19:38 UTC
svn commit: r574608 - in
/lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj:
request/UpdateRequest.java util/ClientUtils.java
Author: billa
Date: Tue Sep 11 07:19:38 2007
New Revision: 574608
URL: http://svn.apache.org/viewvc?rev=574608&view=rev
Log:
SOLR-352: remove duplicated commit and optimize
Modified:
lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/request/UpdateRequest.java
lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/util/ClientUtils.java
Modified: lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/request/UpdateRequest.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/request/UpdateRequest.java?rev=574608&r1=574607&r2=574608&view=diff
==============================================================================
--- lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/request/UpdateRequest.java (original)
+++ lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/request/UpdateRequest.java Tue Sep 11 07:19:38 2007
@@ -169,24 +169,9 @@
writer.append( "</delete>" );
}
- // add the commits
- if (action == ACTION.COMMIT) {
- writer.append("<commit ");
- writer.append("waitFlush=\"" + waitFlush + "\" ");
- writer.append("waitSearcher=\"" + waitSearcher + "\" ");
- writer.append(">");
- writer.append("</commit>");
- }
-
- // add the optimizes
- if (action == ACTION.OPTIMIZE) {
- writer.append("<optimize ");
- writer.append("waitFlush=\"" + waitFlush + "\" ");
- writer.append("waitSearcher=\"" + waitSearcher + "\" ");
- writer.append(">");
- writer.append("</optimize>");
- }
- return writer.toString();
+ // If action is COMMIT or OPTIMIZE, it is sent with params
+ String xml = writer.toString();
+ return (xml.length() > 0) ? xml : null;
}
//--------------------------------------------------------------------------
Modified: lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/util/ClientUtils.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/util/ClientUtils.java?rev=574608&r1=574607&r2=574608&view=diff
==============================================================================
--- lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/util/ClientUtils.java (original)
+++ lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/util/ClientUtils.java Tue Sep 11 07:19:38 2007
@@ -56,9 +56,12 @@
*/
public static Collection<ContentStream> toContentStreams( final String str, final String contentType )
{
+ if( str == null )
+ return null;
+
+ ArrayList<ContentStream> streams = new ArrayList<ContentStream>( 1 );
ContentStreamBase ccc = new ContentStreamBase.StringStream( str );
ccc.setContentType( contentType );
- ArrayList<ContentStream> streams = new ArrayList<ContentStream>();
streams.add( ccc );
return streams;
}