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

[hibernate-commits at lists.jboss.org]

Author: epbernard
Date: 2010-03-10 03:23:04 -0500 (Wed, 10 Mar 2010)
New Revision: 18950

Modified:
   search/trunk/pom.xml
   search/trunk/src/main/java/org/hibernate/search/impl/SearchFactoryImpl.java
Log:
HSEARCH-465 Move to commons-annotations 3.2.0.Final

Modified: search/trunk/pom.xml
===================================================================
--- search/trunk/pom.xml	2010-03-10 08:21:46 UTC (rev 18949)
+++ search/trunk/pom.xml	2010-03-10 08:23:04 UTC (rev 18950)
@@ -117,7 +117,7 @@
         <slf4jVersion>1.5.8</slf4jVersion>
         <luceneVersion>2.9.2</luceneVersion>
         <hibernateVersion>3.5.0-CR-2</hibernateVersion>
-        <hibernateCommonsAnnotationVersion>3.2.0.Beta1</hibernateCommonsAnnotationVersion>
+        <hibernateCommonsAnnotationVersion>3.2.0.Final</hibernateCommonsAnnotationVersion>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -535,7 +535,7 @@
             </properties>
         </profile>
 
-        <!-- The PostgreSQL 8.3.7 test envionment -->
+        <!-- The PostgreSQL 8.3.7 test environment -->
         <profile>
             <id>postgresql837</id>
             <dependencies>
@@ -556,6 +556,26 @@
             </properties>
         </profile>
 
+        <!-- The PostgreSQL 8.4  test environment -->
+        <profile>
+            <id>postgresql84</id>
+            <dependencies>
+                <dependency>
+                    <groupId>postgresql</groupId>
+                    <artifactId>postgresql</artifactId>
+                    <version>8.4-701.jdbc3</version>
+                </dependency>
+            </dependencies>
+            <properties>
+                <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
+                <jdbc.driver>org.postgresql.Driver</jdbc.driver>
+                <jdbc.url>jdbc:postgresql://notinstalled.lab.eng.bos.redhat.com:5432:searctru</jdbc.url>
+                <jdbc.user>searctru</jdbc.user>
+                <jdbc.pass>searctru</jdbc.pass>
+                <jdbc.isolation/>
+            </properties>
+        </profile>
+
         <!--
             ###################################################################
             Then, those with commercial drivers

Modified: search/trunk/src/main/java/org/hibernate/search/impl/SearchFactoryImpl.java
===================================================================
--- search/trunk/src/main/java/org/hibernate/search/impl/SearchFactoryImpl.java	2010-03-10 08:21:46 UTC (rev 18949)
+++ search/trunk/src/main/java/org/hibernate/search/impl/SearchFactoryImpl.java	2010-03-10 08:23:04 UTC (rev 18950)
@@ -226,7 +226,7 @@
 	public void close() {
 		if ( barrier != 0 ) {
 		} //read barrier
-		if ( stopped.compareAndSet( false, true ) ) {
+		if ( stopped.compareAndSet( false, true ) ) {  //make sure we only sop once
 			try {
 				worker.close();
 			}
@@ -241,7 +241,7 @@
 				log.error( "ReaderProvider raises an exception on destroy()", e );
 			}
 
-			//TODO move to DirectoryProviderFactory for cleaner
+			//TODO move directory provider cleaning to DirectoryProviderFactory
 			for ( DirectoryProvider dp : getDirectoryProviders() ) {
 				try {
 					dp.stop();