User: pkendall
Date: 01/08/12 15:11:29
Modified: src/main/org/jboss/mq/pm/rollinglogged
PersistenceManager.java
Log:
Correct initQueue/restore initialization issue.
Revision Changes Path
1.2 +8 -3
jbossmq/src/main/org/jboss/mq/pm/rollinglogged/PersistenceManager.java
Index: PersistenceManager.java
===================================================================
RCS file:
/cvsroot/jboss/jbossmq/src/main/org/jboss/mq/pm/rollinglogged/PersistenceManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PersistenceManager.java 2001/08/11 20:59:15 1.1
+++ PersistenceManager.java 2001/08/12 22:11:29 1.2
@@ -36,7 +36,7 @@
*
* @author David Maplesden ([EMAIL PROTECTED])
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class PersistenceManager extends org.jboss.util.ServiceMBeanSupport
implements org.jboss.mq.pm.PersistenceManager, PersistenceManagerMBean {
@@ -57,7 +57,7 @@
SpyTxLog currentTxLog;
long nextTxId= Long.MIN_VALUE;
// Maps txLogs to Maps of SpyDestinations to SpyMessageLogs
- HashMap messageLogs= new HashMap();
+ HashMap messageLogs= null;
// Maps transactionIds to txInfos
HashMap transToTxLogs= new HashMap();
@@ -205,6 +205,9 @@
queues.put(key, dest);
SpyTxLog txLog= null;
+ if( messageLogs == null )
+ return;
+
HashMap logs;
synchronized (messageLogs) {
logs= (HashMap) messageLogs.get(currentTxLog);
@@ -217,7 +220,7 @@
if (logInfo == null) {
try {
- SpyMessageLog log = new
SpyMessageLog(new URL(dataDirURL, dest.toString() + ".dat1").getFile());
+ SpyMessageLog log = new
SpyMessageLog(new URL(dataDirURL, dest.toString() + ".dat"+numRollOvers).getFile());
logInfo= new LogInfo(log, dest,
currentTxLog);
logs.put("" + dest, logInfo);
} catch (java.net.MalformedURLException e) {
@@ -475,6 +478,8 @@
HashMap txLogs= new HashMap();
java.io.File dir= new java.io.File(dataDirURL.getFile());
java.io.File[] dataFiles= dir.listFiles();
+
+ messageLogs = new HashMap();
for (int i= 0; i < dataFiles.length; ++i) {
String name= dataFiles[i].getName();
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
