You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by eh...@apache.org on 2014/12/08 17:38:54 UTC
svn commit: r1643855 - in /lucene/dev/branches/lucene_solr_4_10/solr: ./
contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/
contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/
Author: ehatcher
Date: Mon Dec 8 16:38:54 2014
New Revision: 1643855
URL: http://svn.apache.org/r1643855
Log:
SOLR-6829: Added getter/setter for lastException in DIH's ContextImpl
Modified:
lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt
lucene/dev/branches/lucene_solr_4_10/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ContextImpl.java
lucene/dev/branches/lucene_solr_4_10/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java
lucene/dev/branches/lucene_solr_4_10/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java
Modified: lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt?rev=1643855&r1=1643854&r2=1643855&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt Mon Dec 8 16:38:54 2014
@@ -95,6 +95,7 @@ Other Changes
* SOLR-6653: bin/solr script should return error code >0 when something fails
(janhoy, Timothy Potter)
+* SOLR-6829: Added getter/setter for lastException in DIH's ContextImpl (ehatcher)
================== 4.10.2 ==================
Modified: lucene/dev/branches/lucene_solr_4_10/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ContextImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ContextImpl.java?rev=1643855&r1=1643854&r2=1643855&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ContextImpl.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ContextImpl.java Mon Dec 8 16:38:54 2014
@@ -50,11 +50,12 @@ public class ContextImpl extends Context
private Map<String, Object> entitySession, globalSession;
+ private Exception lastException = null;
+
DocBuilder.DocWrapper doc;
DocBuilder docBuilder;
- Exception lastException = null;
public ContextImpl(EntityProcessorWrapper epw, VariableResolver resolver,
@@ -255,4 +256,8 @@ public class ContextImpl extends Context
public String replaceTokens(String template) {
return resolver.replaceTokens(template);
}
+
+ public Exception getLastException() { return lastException; }
+
+ public void setLastException(Exception lastException) {this.lastException = lastException; }
}
Modified: lucene/dev/branches/lucene_solr_4_10/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java?rev=1643855&r1=1643854&r2=1643855&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java Mon Dec 8 16:38:54 2014
@@ -171,7 +171,7 @@ public class DocBuilder {
currentProcess = Context.FULL_DUMP;
}
ContextImpl ctx = new ContextImpl(null, getVariableResolver(), null, currentProcess, session, null, this);
- ctx.lastException = lastException;
+ ctx.setLastException(lastException);
listener.onEvent(ctx);
}
Modified: lucene/dev/branches/lucene_solr_4_10/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java?rev=1643855&r1=1643854&r2=1643855&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java Mon Dec 8 16:38:54 2014
@@ -324,7 +324,7 @@ public class TestDocBuilder2 extends Abs
@Override
public void onEvent(Context ctx) {
executed = true;
- lastException = ((ContextImpl) ctx).lastException;
+ lastException = ((ContextImpl) ctx).getLastException();
}
}