User: dbudworth
Date: 01/11/30 10:43:16
Modified: src/main/org/jboss/mq/pm/file MessageLog.java
PersistenceManager.java
Log:
Reverted my non-fs-neutral additions to the file PM
Will try creating a mapping mechanism instead.
Revision Changes Path
1.9 +1 -4 jbossmq/src/main/org/jboss/mq/pm/file/MessageLog.java
Index: MessageLog.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/pm/file/MessageLog.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MessageLog.java 2001/11/28 00:55:29 1.8
+++ MessageLog.java 2001/11/30 18:43:15 1.9
@@ -29,7 +29,7 @@
*
* @created August 16, 2001
* @author: Paul Kendall ([EMAIL PROTECTED])
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class MessageLog {
@@ -83,9 +83,6 @@
try {
File[] files = queueName.listFiles();
for ( int i = 0; i < files.length; i++ ) {
- // If it's a subdirectory, it's a different queue, PM will restore that
also, so ignore it here
- if (files[i].isDirectory())
- continue;
String fileName = files[i].getName();
int extIndex = fileName.indexOf( "." );
if ( extIndex < 0 ) {
1.12 +2 -33 jbossmq/src/main/org/jboss/mq/pm/file/PersistenceManager.java
Index: PersistenceManager.java
===================================================================
RCS file:
/cvsroot/jboss/jbossmq/src/main/org/jboss/mq/pm/file/PersistenceManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PersistenceManager.java 2001/11/28 00:55:29 1.11
+++ PersistenceManager.java 2001/11/30 18:43:15 1.12
@@ -45,7 +45,7 @@
* persistence.
*
* @author Paul Kendall ([EMAIL PROTECTED])
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
*/
public class PersistenceManager extends ServiceMBeanSupport implements
PersistenceManagerMBean, org.jboss.mq.pm.PersistenceManager
{
@@ -161,37 +161,6 @@
}
/**
- * The <code>getDirTree<code> function takes a directory and
- * looks for all subdirectories below it (recursively)
- *
- * Note: Recursive function, REALLY deep queues WILL cause stack fault
- * Note: Possible bug if someone implements an unused queue cleanup
- * and it attempts to remove the parent dir of a deep queue
- * without verifying that it's really just a parent dir
- *
- * @param parent The directory to look in
- *
- * @return The deep list of subdirectories
- */
- private final File[] getDirTree(File parent)
- {
- final ArrayList dirs = new ArrayList(); //must be final
- parent.listFiles(new FileFilter()
- {
- public final boolean accept(File file)
- {
- if (file.isDirectory())
- {
- dirs.add(file); //add to list of all dirs
- file.listFiles(this);
- }
- return false; //avoid File.listFiles doing extra work
- }
- });
- return (File[])dirs.toArray(new File[dirs.size()]);
- }
-
- /**
* The <code>restoreTransactions</code> method is called when the
* PersistenceManager service is started. It reads all transaction log
* files, and pre-restores all messages that are committed and not read.
@@ -203,7 +172,7 @@
private void restoreTransactions() throws javax.jms.JMSException
{
TreeSet txs = new TreeSet();
- File[] transactFiles = getDirTree(dataDirFile);
+ File[] transactFiles = dataDirFile.listFiles();
int queueNameOffset = dataDirFile.toString().length()+1;
if(transactFiles != null)
{
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
