From 1288df5ad44064c887cb7b65d2c3c4a838260514 Mon Sep 17 00:00:00 2001
From: "Timothy A. Bish" <tabish@apache.org>
Date: Fri, 30 Nov 2012 16:15:57 +0000
Subject: [PATCH] fix for: https://issues.apache.org/jira/browse/AMQ-4171

use the getCanonicalPath() value to ensure valid pathnames being used on the platform.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1415725 13f79535-47bb-0310-9956-ffa450edef68
---
 .../store/kahadb/disk/journal/DataFile.java   | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFile.java b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFile.java
index 007bda6083..e014b8ef76 100644
--- a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFile.java
+++ b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFile.java
@@ -20,14 +20,14 @@ import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
-import org.apache.activemq.util.IOHelper;
 import org.apache.activemq.store.kahadb.disk.util.LinkedNode;
 import org.apache.activemq.store.kahadb.disk.util.SequenceSet;
+import org.apache.activemq.util.IOHelper;
 
 /**
  * DataFile
- * 
- * 
+ *
+ *
  */
 public class DataFile extends LinkedNode<DataFile> implements Comparable<DataFile> {
 
@@ -41,7 +41,7 @@ public class DataFile extends LinkedNode<DataFile> implements Comparable<DataFil
         this.dataFileId = Integer.valueOf(number);
         length = (int)(file.exists() ? file.length() : 0);
     }
-    
+
     public File getFile() {
         return file;
     }
@@ -62,12 +62,13 @@ public class DataFile extends LinkedNode<DataFile> implements Comparable<DataFil
         length += size;
     }
 
-    public synchronized String toString() {
+    @Override
+	public synchronized String toString() {
         return file.getName() + " number = " + dataFileId + " , length = " + length;
     }
 
     public synchronized RandomAccessFile openRandomAccessFile() throws IOException {
-        return new RandomAccessFile(file, "rw");
+        return new RandomAccessFile(file.getCanonicalPath(), "rw");
     }
 
     public synchronized void closeRandomAccessFile(RandomAccessFile file) throws IOException {
@@ -77,7 +78,7 @@ public class DataFile extends LinkedNode<DataFile> implements Comparable<DataFil
     public synchronized boolean delete() throws IOException {
         return file.delete();
     }
-    
+
     public synchronized void move(File targetDirectory) throws IOException{
         IOHelper.moveFile(file,targetDirectory);
     }
@@ -85,8 +86,9 @@ public class DataFile extends LinkedNode<DataFile> implements Comparable<DataFil
     public SequenceSet getCorruptedBlocks() {
         return corruptedBlocks;
     }
-    
-    public int compareTo(DataFile df) {
+
+    @Override
+	public int compareTo(DataFile df) {
         return dataFileId - df.dataFileId;
     }