activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r730817 - in /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data: DataFile.java DataManagerImpl.java
Date Fri, 02 Jan 2009 19:06:55 GMT
Author: djencks
Date: Fri Jan  2 11:06:55 2009
New Revision: 730817

URL: http://svn.apache.org/viewvc?rev=730817&view=rev
Log:
AMQ-2052 another file name problem

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataFile.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataManagerImpl.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataFile.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataFile.java?rev=730817&r1=730816&r2=730817&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataFile.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataFile.java
Fri Jan  2 11:06:55 2009
@@ -28,8 +28,8 @@
  */
 class DataFile {
 
-    private File file;
-    private Integer number;
+    private final File file;
+    private final Integer number;
     private int referenceCount;
     private RandomAccessFile randomAcessFile;
     private Object writerData;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataManagerImpl.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataManagerImpl.java?rev=730817&r1=730816&r2=730817&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataManagerImpl.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataManagerImpl.java
Fri Jan  2 11:06:55 2009
@@ -31,6 +31,7 @@
 import org.apache.activemq.kaha.impl.DataManager;
 import org.apache.activemq.kaha.impl.index.RedoStoreIndexItem;
 import org.apache.activemq.util.IOExceptionSupport;
+import org.apache.activemq.util.IOHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -65,7 +66,7 @@
         this.name = name;
         this.storeSize=storeSize;
 
-        dataFilePrefix = NAME_PREFIX + name + "-";
+        dataFilePrefix = IOHelper.toFileSystemSafeName(NAME_PREFIX + name + "-");
         // build up list of current dataFiles
         File[] files = dir.listFiles(new FilenameFilter() {
             public boolean accept(File dir, String n) {



Mime
View raw message