User: starksm Date: 01/12/27 13:16:27 Modified: src/main/org/jboss/mq/pm/jdbc Tag: Branch_2_4 PersistenceManager.java Log: Apply patch #492167 to move setup of DataSource to startService Revision Changes Path No revision No revision 1.2.2.2 +17 -7 jbossmq/src/main/org/jboss/mq/pm/jdbc/PersistenceManager.java Index: PersistenceManager.java =================================================================== RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/pm/jdbc/PersistenceManager.java,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- PersistenceManager.java 2001/08/23 03:57:11 1.2.2.1 +++ PersistenceManager.java 2001/12/27 21:16:26 1.2.2.2 @@ -9,6 +9,7 @@ import java.net.URL; import java.sql.*; +import java.util.Map; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; @@ -41,7 +42,7 @@ * * @created August 16, 2001 * @author: Jayesh Parayali ([EMAIL PROTECTED]) - * @version $Revision: 1.2.2.1 $ + * @version $Revision: 1.2.2.2 $ */ public class PersistenceManager extends org.jboss.util.ServiceMBeanSupport implements PersistenceManagerMBean, org.jboss.mq.pm.PersistenceManager { @@ -95,19 +96,28 @@ public void initService() throws Exception { - //Get an InitialContext - InitialContext ctx = new InitialContext(); - datasource = ( DataSource )ctx.lookup( jmsDBPoolName ); - txLog = new TxLog( datasource ); - JMSServer server = ( JMSServer )getServer().invoke( new ObjectName( org.jboss.mq.server.JBossMQServiceMBean.OBJECT_NAME ), "getJMSServer", new Object[]{}, new String[]{} ); server.setPersistenceManager( this ); - } public void startService() throws Exception { + //Get an InitialContext + InitialContext ctx = new InitialContext(); + datasource = ( DataSource )ctx.lookup( jmsDBPoolName ); + txLog = new TxLog( datasource ); + + // fix up all the LogInfo objects on the log queue + for (Iterator iter = messageLogs.entrySet().iterator(); iter.hasNext();) + { + Map.Entry entry = (Map.Entry)iter.next(); + String key = (String)entry.getKey(); + LogInfo info = (LogInfo)entry.getValue(); + MessageLog log = info.log; + log.datasource = datasource; + } + JMSServer server = ( JMSServer )getServer().invoke( new ObjectName( org.jboss.mq.server.JBossMQServiceMBean.OBJECT_NAME ), "getJMSServer", new Object[]{}, new String[]{} ); restore( server );
_______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development