You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jd...@apache.org on 2012/04/23 23:06:51 UTC
svn commit: r1329444 - in
/lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler:
CHANGES.txt
src/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java
src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java
Author: jdyer
Date: Mon Apr 23 21:06:50 2012
New Revision: 1329444
URL: http://svn.apache.org/viewvc?rev=1329444&view=rev
Log:
SOLR-3360: More bug fixes for "threads" (3.6 only).
Modified:
lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/CHANGES.txt
lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java
lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java
Modified: lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/CHANGES.txt?rev=1329444&r1=1329443&r2=1329444&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/CHANGES.txt Mon Apr 23 21:06:50 2012
@@ -11,7 +11,9 @@ $Id$
================== 3.6.1 ==================
-(No Changes)
+Bug Fixes
+----------------------
+* SOLR-3360: More bug fixes for the deprecated "threads" parameter. (Mikhail Khludnev, Claudio R, via James Dyer)
================== 3.6.0 ==================
Modified: lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java?rev=1329444&r1=1329443&r2=1329444&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java (original)
+++ lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java Mon Apr 23 21:06:50 2012
@@ -57,11 +57,13 @@ public class EntityProcessorBase extends
if (isFirstInit) {
firstInit(context);
}
+
if(cacheSupport!=null) {
+ cacheSupport.initNewParent(context);
+ } else {
rowIterator = null;
query = null;
- cacheSupport.initNewParent(context);
- }
+ }
}
@@ -119,12 +121,10 @@ public class EntityProcessorBase extends
if (rowIterator.hasNext())
return rowIterator.next();
query = null;
- rowIterator = null;
return null;
} catch (Exception e) {
SolrException.log(log, "getNext() failed for query '" + query + "'", e);
query = null;
- rowIterator = null;
wrapAndThrow(DataImportHandlerException.WARN, e);
return null;
}
Modified: lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java?rev=1329444&r1=1329443&r2=1329444&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java (original)
+++ lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java Mon Apr 23 21:06:50 2012
@@ -203,9 +203,11 @@ public class XPathEntityProcessor extend
while (true) {
result = fetchNextRow();
- if (result == null)
+ if (result == null){
+ rowIterator = null;
return null;
-
+ }
+
if (pk == null || result.get(pk) != null)
return result;
}