[hibernate-commits] Hibernate SVN: r21031 - in search/branches/v3_1_1_GA_CP: src/main/java/org/hibernate/search/store and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: stliu
Date: 2012-05-17 02:50:31 -0400 (Thu, 17 May 2012)
New Revision: 21031

Modified:
   search/branches/v3_1_1_GA_CP/pom.xml
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java
Log:
JBPAPP-8351 [HSEARCH-321] FSSlaveDirectoryProvider incorrectly creates a subdirectory named 0

Modified: search/branches/v3_1_1_GA_CP/pom.xml
===================================================================
--- search/branches/v3_1_1_GA_CP/pom.xml	2012-05-17 05:43:28 UTC (rev 21030)
+++ search/branches/v3_1_1_GA_CP/pom.xml	2012-05-17 06:50:31 UTC (rev 21031)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
   ~ Hibernate, Relational Persistence for Idiomatic Java
   ~
@@ -33,12 +32,12 @@
 	<parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.3.2.GA_CP04</version>
+        <version>3.3.2.GA_CP05</version>
     </parent>
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-search</artifactId>
 	<packaging>jar</packaging>
-    <version>3.1.1.GA_CP04</version>
+    <version>3.1.1.GA_CP05</version>
 
     <name>Hibernate Search</name>
     <description>Hibernate Search</description>
@@ -57,7 +56,7 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>3.3.2.GA_CP04</version>
+            <version>3.3.2.GA_CP05</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
@@ -222,13 +221,13 @@
                 <dependency>
                     <groupId>org.hibernate</groupId>
                     <artifactId>hibernate-annotations</artifactId>
-                    <version>3.4.0.GA_CP04</version>
+                    <version>3.4.0.GA_CP05</version>
                     <optional>true</optional>
                 </dependency>
                 <dependency>
                     <groupId>org.hibernate</groupId>
                     <artifactId>hibernate-entitymanager</artifactId>
-                    <version>3.4.0.GA_CP04</version>
+                    <version>3.4.0.GA_CP05</version>
                     <optional>true</optional>
                 </dependency>
                 <dependency>

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java	2012-05-17 05:43:28 UTC (rev 21030)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java	2012-05-17 06:50:31 UTC (rev 21031)
@@ -91,7 +91,7 @@
 				//no default
 				log.debug( "Setting directory 1 as current" );
 				currentToBe = 1;
-				File destinationFile = new File( indexDir, Integer.valueOf( readCurrentState ).toString() );
+				File destinationFile = new File( indexDir, Integer.valueOf( currentToBe ).toString() );
 				int sourceCurrent;
 				if ( new File( sourceIndexDir, "current1" ).exists() ) {
 					sourceCurrent = 1;