User: pkendall
Date: 01/08/09 14:32:08
Modified: src/main/org/jbossmq/pm/rollinglogged
PersistenceManager.java
Log:
Fix restore bug.
Revision Changes Path
1.4 +13 -11
jbossmq/src/main/org/jbossmq/pm/rollinglogged/PersistenceManager.java
Index: PersistenceManager.java
===================================================================
RCS file:
/cvsroot/jboss/jbossmq/src/main/org/jbossmq/pm/rollinglogged/PersistenceManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PersistenceManager.java 2001/08/09 01:18:28 1.3
+++ PersistenceManager.java 2001/08/09 21:32:08 1.4
@@ -27,7 +27,7 @@
*
* @author David Maplesden ([EMAIL PROTECTED])
*
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class PersistenceManager
extends ServiceMBeanSupport
@@ -449,17 +449,19 @@
SpyMessage [] messages = messageLog.restore(commitedTxs);
SpyTxLog txLog = (SpyTxLog)txLogs.get(new Integer(rollOver));
SpyDestination dest = (SpyDestination)queues.get(key);
- JMSDestination q = server.getJMSDestination(dest);
- LogInfo info = new LogInfo(messageLog,dest,txLog);
- info.liveMessages = messages.length;
- HashMap logs = (HashMap)messageLogs.get(txLog);
- logs.put(key,info);
+ if( dest != null ) {
+ JMSDestination q = server.getJMSDestination(dest);
+ LogInfo info = new LogInfo(messageLog,dest,txLog);
+ info.liveMessages = messages.length;
+ HashMap logs = (HashMap)messageLogs.get(txLog);
+ logs.put(key,info);
//TODO: make sure this lock is good enough
- synchronized(q){
- for(int j=0;j<messages.length;j++){
- messages[j].persistData = info;
- q.restoreMessage(messages[j]);
- }
+ synchronized(q){
+ for(int j=0;j<messages.length;j++){
+ messages[j].persistData = info;
+ q.restoreMessage(messages[j]);
+ }
+ }
}
}
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
