User: chirino
Date: 01/11/13 20:23:27
Modified: src/main/org/jboss/mq/pm/file PersistenceManager.java
Log:
Factored out a CacheStore object from the message store. This should lay the
ground work needed so that the MessageCache can use a PM for saving and loading
messages.
Also fixed a small bug in the file PM. It was not properly restoring the message
after a server restart.
Revision Changes Path
1.10 +7 -5 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PersistenceManager.java 2001/11/10 21:38:04 1.9
+++ PersistenceManager.java 2001/11/14 04:23:27 1.10
@@ -43,7 +43,7 @@
* persistence.
*
* @author Paul Kendall ([EMAIL PROTECTED])
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
public class PersistenceManager extends ServiceMBeanSupport implements
PersistenceManagerMBean, org.jboss.mq.pm.PersistenceManager
{
@@ -80,7 +80,7 @@
txManager = new TxManager(this);
}
- public org.jboss.mq.pm.PersistenceManager getInstance()
+ public Object getInstance()
{
return this;
}
@@ -169,7 +169,6 @@
*/
private void restoreTransactions() throws javax.jms.JMSException
{
- //reconstruct TXs
TreeSet txs = new TreeSet();
File[] transactFiles = dataDirFile.listFiles();
if(transactFiles != null)
@@ -180,7 +179,7 @@
if( transactFiles[i].isDirectory() )
{
String dirName = transactFiles[i].toString();
- int start = transactFiles[i].getParent().length();
+ int start = transactFiles[i].getParent().length()+1;
String key = dirName.substring(start);
MessageLog log = new MessageLog(messageCache, transactFiles[i]);
LogInfo info = new LogInfo(log, null);
@@ -229,6 +228,7 @@
{
Object key = i.next();
LogInfo logInfo = (LogInfo)clone.get(key);
+ log.debug("Recovered messages destined for: "+key);
unrestoredMessages.put(key, logInfo.log.restore(txs));
}
@@ -289,9 +289,10 @@
public void restoreQueue(JMSDestination jmsDest, SpyDestination dest)
throws JMSException
{
+ log.debug("restoring destination: "+dest);
//remember this queue
- String queueName = dest.toString();
+ String queueName = dest.toString();
LogInfo info = (LogInfo)messageLogs.get(queueName);
if (info == null)
{
@@ -314,6 +315,7 @@
Map messages = (Map)unrestoredMessages.remove(queueName);
if (messages != null)
{
+ log.debug("Restore message count: "+messages.size());
synchronized (jmsDest)
{
Iterator m = messages.values().iterator();
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
