[jboss-cvs] JBossAS SVN: r107689 - projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/channelfactory.

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

Author: pferraro
Date: 2010-08-19 12:17:07 -0400 (Thu, 19 Aug 2010)
New Revision: 107689

Added:
   projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/channelfactory/MuxChannel.java
Modified:
   projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/channelfactory/JChannelFactory.java
Log:
JChannelFactory will always returns channels that always use a MuxUpHandler.

Modified: projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/channelfactory/JChannelFactory.java
===================================================================
--- projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/channelfactory/JChannelFactory.java	2010-08-19 15:49:45 UTC (rev 107688)
+++ projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/channelfactory/JChannelFactory.java	2010-08-19 16:17:07 UTC (rev 107689)
@@ -1267,7 +1267,7 @@
                       "singleton_name and MuxChannels are not supported.");
          }
       }
-      JChannel channel = new JChannel(config);
+      JChannel channel = new MuxChannel(config);
       
       if (manageNewThreadClassLoader || manageReleasedThreadClassLoader)
       {

Added: projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/channelfactory/MuxChannel.java
===================================================================
--- projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/channelfactory/MuxChannel.java	                        (rev 0)
+++ projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/channelfactory/MuxChannel.java	2010-08-19 16:17:07 UTC (rev 107689)
@@ -0,0 +1,88 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ha.core.channelfactory;
+
+import java.io.File;
+import java.net.URL;
+
+import org.jboss.ha.core.jgroups.blocks.mux.MuxUpHandler;
+import org.jgroups.ChannelException;
+import org.jgroups.JChannel;
+import org.jgroups.UpHandler;
+import org.jgroups.conf.ProtocolStackConfigurator;
+import org.w3c.dom.Element;
+
+public class MuxChannel extends JChannel
+{
+   public MuxChannel() throws ChannelException
+   {
+      super();
+      this.defaultUpHandler();
+   }
+
+   public MuxChannel(Element properties) throws ChannelException
+   {
+      super(properties);
+      this.defaultUpHandler();
+   }
+
+   public MuxChannel(File properties) throws ChannelException
+   {
+      super(properties);
+      this.defaultUpHandler();
+   }
+
+   public MuxChannel(JChannel ch) throws ChannelException
+   {
+      super(ch);
+      this.defaultUpHandler();
+   }
+
+   public MuxChannel(ProtocolStackConfigurator configurator) throws ChannelException
+   {
+      super(configurator);
+      this.defaultUpHandler();
+   }
+
+   public MuxChannel(String properties) throws ChannelException
+   {
+      super(properties);
+      this.defaultUpHandler();
+   }
+
+   public MuxChannel(URL properties) throws ChannelException
+   {
+      super(properties);
+      this.defaultUpHandler();
+   }
+
+   private void defaultUpHandler()
+   {
+      this.up_handler = new MuxUpHandler();
+   }
+   
+   @Override
+   public void setUpHandler(UpHandler upHandler)
+   {
+      this.up_handler = new MuxUpHandler(upHandler);
+   }   
+}