CVS update: JGroups/src/org/jgroups JChannel.java

"Bela Ban" <[email protected]> Thu, 16 Sep 2010 15:46:52 +0000
Newsgroups gmane.comp.java.javagroups.cvs
Message-ID <[email protected]>
  User: belaban 
  Date: 10/09/16 15:46:52

  Modified:    src/org/jgroups JChannel.java
  Log:
  ns
  
  Revision  Changes    Path
  1.247     +6 -6      JGroups/src/org/jgroups/JChannel.java
  
  Index: JChannel.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/JChannel.java,v
  retrieving revision 1.246
  retrieving revision 1.247
  diff -u -r1.246 -r1.247
  --- JChannel.java	16 Sep 2010 14:21:39 -0000	1.246
  +++ JChannel.java	16 Sep 2010 15:46:52 -0000	1.247
  @@ -82,7 +82,7 @@
    * the construction of the stack will be aborted.
    *
    * @author Bela Ban
  - * @version $Id: JChannel.java,v 1.246 2010/09/16 14:21:39 belaban Exp $
  + * @version $Id: JChannel.java,v 1.247 2010/09/16 15:46:52 belaban Exp $
    */
   @MBean(description="JGroups channel")
   public class JChannel extends Channel {
  @@ -633,8 +633,8 @@
               List<ProtocolConfiguration> configs=Configurator.parseConfigurations(props);
   
               // new stack is created on open() - bela June 12 2003
  -            prot_stack=new ProtocolStack(this, configs);
  -            prot_stack.setup();
  +            prot_stack=new ProtocolStack(this);
  +            prot_stack.setup(configs);
               closed=false;
           }
           catch(Exception e) {
  @@ -1691,9 +1691,9 @@
           }
   
           synchronized(Channel.class) {
  -            prot_stack=new ProtocolStack(this, configs);
  +            prot_stack=new ProtocolStack(this);
               try {
  -                prot_stack.setup(); // Setup protocol stack (creates protocol, calls init() on them)
  +                prot_stack.setup(configs); // Setup protocol stack (creates protocol, calls init() on them)
               }
               catch(Throwable e) {
                   throw new ChannelException("unable to setup the protocol stack", e);
  @@ -1708,7 +1708,7 @@
               log.info("JGroups version: " + Version.description);
   
           synchronized(JChannel.class) {
  -            prot_stack=new ProtocolStack(this, null);
  +            prot_stack=new ProtocolStack(this);
               try {
                   prot_stack.setup(ch.getProtocolStack()); // Setup protocol stack (creates protocol, calls init() on them)
               }
  
  
  

------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev