[hibernate-commits] Hibernate SVN: r14327 - in search/trunk: src/java/org/hibernate/search/reader and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: epbernard
Date: 2008-02-10 23:47:29 -0500 (Sun, 10 Feb 2008)
New Revision: 14327

Added:
   search/trunk/lib/lucene-core-2.3.0.jar
Removed:
   search/trunk/lib/lucene-core-2.2.0.jar
Modified:
   search/trunk/lib/README.txt
   search/trunk/src/java/org/hibernate/search/reader/ReaderProviderHelper.java
Log:
HSEARCH-150 Upgrade to Lucene 2.3

Modified: search/trunk/lib/README.txt
===================================================================
--- search/trunk/lib/README.txt	2008-02-10 19:58:01 UTC (rev 14326)
+++ search/trunk/lib/README.txt	2008-02-11 04:47:29 UTC (rev 14327)
@@ -6,7 +6,7 @@
 hibernate-commons-annotations.jar: required
 hibernate3.jar: required
 hibernate core dependencies: required (see Hibernate Core for more information)
-lucene-core-*.jar: required (used version 2.2.0)
+lucene-core-*.jar: required (used version 2.3.0)
 jms.jar: optional (needed for JMS based clustering strategy, usually available with your application server)
 
 Test

Deleted: search/trunk/lib/lucene-core-2.2.0.jar
===================================================================
(Binary files differ)

Added: search/trunk/lib/lucene-core-2.3.0.jar
===================================================================
(Binary files differ)


Property changes on: search/trunk/lib/lucene-core-2.3.0.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: search/trunk/src/java/org/hibernate/search/reader/ReaderProviderHelper.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/reader/ReaderProviderHelper.java	2008-02-10 19:58:01 UTC (rev 14326)
+++ search/trunk/src/java/org/hibernate/search/reader/ReaderProviderHelper.java	2008-02-11 04:47:29 UTC (rev 14327)
@@ -21,18 +21,20 @@
 			try {
 				return new MultiReader( readers );
 			}
-			catch (IOException e) {
+			catch (Exception e) {
+				//Lucene 2.2 used to through IOExceptions here
 				clean( new SearchException( "Unable to open a MultiReader", e ), readers );
-				return null; //never happen, but please the compiler
+				return null; //never happens, but please the compiler
 			}
 		}
 		else {
 			try {
 				return new MultiReader( readers );
 			}
-			catch (IOException e) {
+			catch (Exception e) {
+				//Lucene 2.2 used to through IOExceptions here
 				clean( new SearchException( "Unable to open a MultiReader", e ), readers );
-				return null; //never happen, but please the compiler
+				return null; //never happens, but please the compiler
 			}
 		}
 	}