[jboss-cvs] JBoss Messaging SVN: r3129 - trunk/src/main/org/jboss/messaging/core/jmx.

[jboss-cvs-commits at lists.jboss.org]

Author: timfox
Date: 2007-09-21 05:50:45 -0400 (Fri, 21 Sep 2007)
New Revision: 3129

Modified:
   trunk/src/main/org/jboss/messaging/core/jmx/MessagingPostOfficeService.java
Log:
Make sure jgroups classes aren't used for non clustered


Modified: trunk/src/main/org/jboss/messaging/core/jmx/MessagingPostOfficeService.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/jmx/MessagingPostOfficeService.java	2007-09-21 03:39:18 UTC (rev 3128)
+++ trunk/src/main/org/jboss/messaging/core/jmx/MessagingPostOfficeService.java	2007-09-21 09:50:45 UTC (rev 3129)
@@ -351,44 +351,44 @@
                   
          FilterFactory ff = new SelectorFactory();
          
-         ChannelFactory jChannelFactory = null;
+         if (clustered)
+         {        
+            ChannelFactory jChannelFactory = null;
 
-         if (channelFactoryName != null)
-         {
-            Object info = null;
-            try
+         	if (channelFactoryName != null)
             {
-               info = server.getMBeanInfo(channelFactoryName);
-            }
-            catch (Exception e)
-            {
-               // log.error("Error", e);
-               // noop... means we couldn't find the channel hence we should use regular
-               // XMLChannelFactories
-            }
+               Object info = null;
+               try
+               {
+                  info = server.getMBeanInfo(channelFactoryName);
+               }
+               catch (Exception e)
+               {
+                  // log.error("Error", e);
+                  // noop... means we couldn't find the channel hence we should use regular
+                  // XMLChannelFactories
+               }
 
-            if (info != null)
-            {
-               log.debug(this + " uses MultiplexerJChannelFactory");
+               if (info != null)
+               {
+                  log.debug(this + " uses MultiplexerJChannelFactory");
 
-               jChannelFactory =
-                  new MultiplexerChannelFactory(server, channelFactoryName, channelPartitionName,
-                                                 controlChannelName, dataChannelName);
+                  jChannelFactory =
+                     new MultiplexerChannelFactory(server, channelFactoryName, channelPartitionName,
+                                                    controlChannelName, dataChannelName);
+               }
+               else
+               {
+                  log.debug(this + " uses XMLJChannelFactory");
+                  jChannelFactory = new XMLChannelFactory(controlChannelConfig, dataChannelConfig);
+               }
             }
             else
             {
                log.debug(this + " uses XMLJChannelFactory");
                jChannelFactory = new XMLChannelFactory(controlChannelConfig, dataChannelConfig);
             }
-         }
-         else
-         {
-            log.debug(this + " uses XMLJChannelFactory");
-            jChannelFactory = new XMLChannelFactory(controlChannelConfig, dataChannelConfig);
-         }
-
-         if (clustered)
-         {         
+         	
 	         postOffice =  new MessagingPostOffice(ds, tm, sqlProperties,
 	                                               createTablesOnStartup,
 	                                               nodeId, officeName, ms,