Author: rajdavies
Date: Wed Sep 5 08:47:20 2007
New Revision: 572975
URL: http://svn.apache.org/viewvc?rev=572975&view=rev
Log:
Ensure system safe names are used for container names
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/KahaStore.java
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/KahaStore.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/KahaStore.java?rev=572975&r1=572974&r2=572975&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/KahaStore.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/KahaStore.java
Wed Sep 5 08:47:20 2007
@@ -217,9 +217,10 @@
return getMapContainer(id, containerName, persistentIndex);
}
- public synchronized MapContainer getMapContainer(Object id, String
containerName, boolean persistentIndex)
+ public synchronized MapContainer getMapContainer(Object id, String
originalContainerName, boolean persistentIndex)
throws IOException {
initialize();
+ String containerName =
IOHelper.toFileSystemSafeName(originalContainerName);
ContainerId containerId = new ContainerId();
containerId.setKey(id);
containerId.setDataContainerName(containerName);
@@ -286,9 +287,10 @@
return getListContainer(id, containerName, persistentIndex);
}
- public synchronized ListContainer getListContainer(Object id, String
containerName,
+ public synchronized ListContainer getListContainer(Object id, String
originalContainerName,
boolean
persistentIndex) throws IOException {
initialize();
+ String containerName =
IOHelper.toFileSystemSafeName(originalContainerName);
ContainerId containerId = new ContainerId();
containerId.setKey(id);
containerId.setDataContainerName(containerName);