[jboss-cvs] JBoss Messaging SVN: r4944 - in branches/Branch_JBossMessaging_1_4_0_SP3_CP: tests/src/org/jboss/test/messaging/core and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Sep 15 12:39:30 EDT 2008
Author: clebert.suconic at jboss.com
Date: 2008-09-15 12:39:30 -0400 (Mon, 15 Sep 2008)
New Revision: 4944
Modified:
branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java
branches/Branch_JBossMessaging_1_4_0_SP3_CP/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java
branches/Branch_JBossMessaging_1_4_0_SP3_CP/tests/src/org/jboss/test/messaging/core/postoffice/ClusteredPersistenceServiceConfigFileJChannelFactory.java
Log:
Few tweaks on persistence-manager, and equalizing few changes from Branch_Stable
Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java 2008-09-15 14:48:56 UTC (rev 4943)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java 2008-09-15 16:39:30 UTC (rev 4944)
@@ -224,6 +224,12 @@
try
{
closeResultSet(rset);
+ }
+ catch (Throwable ignored)
+ {
+ }
+ try
+ {
closeStatement(selectCount);
}
catch (Throwable ignored)
@@ -2369,7 +2375,6 @@
}
else
{
- // ps.setNull doesn't work to setup a blog field as null on DB2, however ps.setBinaryStream works in all the databases
ps.setBinaryStream(headerPosition, null, 0);
}
@@ -2380,7 +2385,6 @@
}
else
{
- // ps.setNull doesn't work to setup a blog field as null on DB2, however ps.setBinaryStream works in all the databases
ps.setBinaryStream(payloadPosition, null, 0);
}
}
Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java 2008-09-15 14:48:56 UTC (rev 4943)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java 2008-09-15 16:39:30 UTC (rev 4944)
@@ -65,13 +65,13 @@
// Static ---------------------------------------------------------------------------------------
protected static PostOffice createClusteredPostOffice(int nodeID,
- String groupName,
- long stateTimeout,
- long castTimeout,
- ServiceContainer sc,
- MessageStore ms,
- TransactionRepository tr,
- PersistenceManager pm)
+ String groupName,
+ long stateTimeout,
+ long castTimeout,
+ ServiceContainer sc,
+ MessageStore ms,
+ TransactionRepository tr,
+ PersistenceManager pm)
throws Exception
{
FilterFactory ff = new SimpleFilterFactory();
@@ -84,11 +84,8 @@
String configFilePath = sc.getPersistenceConfigFile(true);
- // TODO (ovidiu) we're temporarily ignoring the multiplex option, it doesn't work well
- boolean ignoreMultiplexer = true;
ChannelFactory jChannelFactory =
new ClusteredPersistenceServiceConfigFileJChannelFactory(configFilePath,
- ignoreMultiplexer,
sc.getMBeanServer());
MessagingPostOffice postOffice =
@@ -104,22 +101,22 @@
}
protected static PostOffice createNonClusteredPostOffice(ServiceContainer sc, MessageStore ms, TransactionRepository tr,
- PersistenceManager pm)
- throws Exception
+ PersistenceManager pm)
+ throws Exception
{
- FilterFactory ff = new SimpleFilterFactory();
- ConditionFactory cf = new SimpleConditionFactory();
+ FilterFactory ff = new SimpleFilterFactory();
+ ConditionFactory cf = new SimpleConditionFactory();
IDManager idm = new IDManager("channel_id", 10, pm);
ClusterNotifier cn = new DefaultClusterNotifier();
- MessagingPostOffice postOffice =
- new MessagingPostOffice(sc.getDataSource(), sc.getTransactionManager(),
- sc.getPostOfficeSQLProperties(),
- true, 1, "NonClustered", ms, pm, tr, ff, cf, idm, cn);
+ MessagingPostOffice postOffice =
+ new MessagingPostOffice(sc.getDataSource(), sc.getTransactionManager(),
+ sc.getPostOfficeSQLProperties(),
+ true, 1, "NonClustered", ms, pm, tr, ff, cf, idm, cn);
- postOffice.start();
+ postOffice.start();
- return postOffice;
+ return postOffice;
}
// Attributes -----------------------------------------------------------------------------------
@@ -150,12 +147,12 @@
// Protected --------------------------------------------------------
- protected PostOffice createNonClusteredPostOffice() throws Exception
- {
- return createNonClusteredPostOffice(sc, ms, tr, pm);
- }
+ protected PostOffice createNonClusteredPostOffice() throws Exception
+ {
+ return createNonClusteredPostOffice(sc, ms, tr, pm);
+ }
- protected PostOffice createClusteredPostOffice(int nodeID) throws Exception
+ protected PostOffice createClusteredPostOffice(int nodeID) throws Exception
{
//System property provides group name so we can run concurrently in QA lab
String groupName = System.getProperty("jboss.messaging.groupname");
@@ -261,7 +258,7 @@
protected void tearDown() throws Exception
{
- Thread.sleep(2000);
+ Thread.sleep(2000);
try
{
Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP/tests/src/org/jboss/test/messaging/core/postoffice/ClusteredPersistenceServiceConfigFileJChannelFactory.java
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP/tests/src/org/jboss/test/messaging/core/postoffice/ClusteredPersistenceServiceConfigFileJChannelFactory.java 2008-09-15 14:48:56 UTC (rev 4943)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP/tests/src/org/jboss/test/messaging/core/postoffice/ClusteredPersistenceServiceConfigFileJChannelFactory.java 2008-09-15 16:39:30 UTC (rev 4944)
@@ -63,12 +63,11 @@
* Irrelevant if skipMultiplex is true.
*/
public ClusteredPersistenceServiceConfigFileJChannelFactory(String configFilePath,
- boolean skipMultiplex,
MBeanServer mbeanServer)
throws Exception
{
this.configFilePath = configFilePath;
- init(configFilePath, skipMultiplex, mbeanServer);
+ init(configFilePath, mbeanServer);
}
// ChannelFactory ------------------------------------------------------------------------------
@@ -110,7 +109,7 @@
// Private --------------------------------------------------------------------------------------
- private void init(String configFilePath, boolean skipMultiplex, MBeanServer mbeanServer)
+ private void init(String configFilePath, MBeanServer mbeanServer)
throws Exception
{
log.debug("using configuration file " + configFilePath);
@@ -121,7 +120,7 @@
// first, we try to use a channel factory service, if we find one configured
String s = (String)postOfficeConfig.getAttributeValue("ChannelFactoryName");
- if (s != null && !skipMultiplex)
+ if (s != null)
{
// there's a chance we can use a multiplexer service
ObjectName channelFactoryName = new ObjectName(s);
More information about the jboss-cvs-commits
mailing list