IndexExceptionHandler...

bleujin · Apr 10, 2014 · 09a580b · 09a580b
1 parent c8e23a4
commit 09a580b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/publish/isearcher_4.4.jar b/publish/isearcher_4.4.jar
diff --git a/src/net/ion/nsearcher/index/IndexExceptionHandler.java b/src/net/ion/nsearcher/index/IndexExceptionHandler.java
@@ -3,17 +3,18 @@
 public interface IndexExceptionHandler<T> {
 
 	public static IndexExceptionHandler<Void> DEFAULT = new IndexExceptionHandler<Void>() {
-		public Void onException(Throwable ex) {
-			ex.printStackTrace() ;
-			return null ;
-		}
+//		public Void onException(Throwable ex) {
+//			ex.printStackTrace() ;
+//			return null ;
+//		}
 
 		@Override
-		public Void onException(IndexJob<Void> job, Throwable ex) {
-			return onException(ex);
+		public Void onException(IndexJob job, Throwable ex) {
+			ex.printStackTrace() ;
+			return null ;
 		}
 	};
 
-	public T onException(Throwable ex) ;
-	public T onException(IndexJob<T> job, Throwable ex) ;
+//	public T onException(Throwable ex) ;
+	public T onException(IndexJob job, Throwable ex) ;
 }
diff --git a/src/net/ion/nsearcher/index/Indexer.java b/src/net/ion/nsearcher/index/Indexer.java
@@ -42,9 +42,9 @@ public <T> T index(String name, Analyzer analyzer, IndexJob<T> indexJob) {
 		try {
 			return asyncIndex(name, analyzer, indexJob).get() ;
 		} catch (InterruptedException e) {
-			ehandler.onException(e) ;
+			ehandler.onException(indexJob, e) ;
 		} catch (ExecutionException e) {
-			ehandler.onException(e) ;
+			ehandler.onException(indexJob, e) ;
 		}
 		return null ;
 	}
@@ -92,7 +92,7 @@ public T call() throws Exception {
 					return result;
 				} catch(Throwable ex) {
 					if (session != null) session.rollback();
-					handler.onException(ex) ;
+					handler.onException(indexJob, ex) ;
 //					return null ;
 					throw new IndexException(ex.getMessage(), ex) ;
 				} finally {