svn commit: r1795776 - in /aries/trunk/transaction/transaction-manager/src: main/java/org/apache/aries/transaction/internal/TransactionLogUtils.java test/java/org/apache/aries/transaction/internal/LogConversionTest.java

[ggrzybek]

Author: ggrzybek
Date: Mon May 22 06:51:11 2017
New Revision: 1795776

URL: http://svn.apache.org/viewvc?rev=1795776&view=rev
Log:
[ARIES-1719] Fix case when howl log directory has trailing path separator

Modified:
    
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionLogUtils.java
    
aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/LogConversionTest.java

Modified: 
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionLogUtils.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionLogUtils.java?rev=1795776&r1=1795775&r2=1795776&view=diff
==============================================================================
--- 
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionLogUtils.java
 (original)
+++ 
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionLogUtils.java
 Mon May 22 06:51:11 2017
@@ -78,7 +78,10 @@ public class TransactionLogUtils {
         }
 
         File oldDir = new File(oldLogDirectory);
+        oldLogDirectory = oldDir.getAbsolutePath();
         File newDir = new File(newLogDirectory);
+        newLogDirectory = newDir.getAbsolutePath();
+
         // a file which may tell us what's the previous configuation
         File transaction_1 = null;
 

Modified: 
aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/LogConversionTest.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/LogConversionTest.java?rev=1795776&r1=1795775&r2=1795776&view=diff
==============================================================================
--- 
aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/LogConversionTest.java
 (original)
+++ 
aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/LogConversionTest.java
 Mon May 22 06:51:11 2017
@@ -321,7 +321,7 @@ public class LogConversionTest {
         properties.put("aries.transaction.howl.maxBuffers", "0");
         properties.put("aries.transaction.howl.threadsWaitingForceThreshold", 
"-1");
         properties.put("aries.transaction.flushPartialBuffers", "true");
-        String absoluteLogFileDir = new File(BASE, 
logFileDir).getAbsolutePath();
+        String absoluteLogFileDir = new File(BASE, 
logFileDir).getAbsolutePath() + "/";
         properties.put("aries.transaction.howl.logFileDir", 
absoluteLogFileDir);
         properties.put("aries.transaction.howl.bufferSize", 
Integer.toString(bufferSizeInKB));
         properties.put("aries.transaction.howl.maxBlocksPerFile", 
Integer.toString(maxBlocksPerFile));