[jboss-cvs] JBossCache/src/org/jboss/cache ...

[Brian Stansberry]

  User: bstansberry
  Date: 07/01/09 17:26:40

  Modified:    src/org/jboss/cache  CacheImpl.java
  Log:
  Don't use default props to create a channel if mux channel creation fails
  
  Revision  Changes    Path
  1.19      +9 -1      JBossCache/src/org/jboss/cache/CacheImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/CacheImpl.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- CacheImpl.java	9 Jan 2007 01:43:09 -0000	1.18
  +++ CacheImpl.java	9 Jan 2007 22:26:39 -0000	1.19
  @@ -100,7 +100,7 @@
    * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
    * @author Brian Stansberry
    * @author Daniel Huang (dhuang at jboss.org)
  - * @version $Id: CacheImpl.java,v 1.18 2007/01/09 01:43:09 msurtani Exp $
  + * @version $Id: CacheImpl.java,v 1.19 2007/01/09 22:26:39 bstansberry Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -676,6 +676,14 @@
               {
                  if (configuration.getClusterConfig() == null)
                  {
  +                  // BES Jan-9-2007 temp workaround until we decide if we should
  +                  // aggressively throw exceptions from getMultiplexerChannel
  +                  if (configuration.getMultiplexerService() != null
  +                        || configuration.getMultiplexerStack() != null
  +                        || configuration.getRuntimeConfig().getMuxChannelFactory() != null)
  +                  {
  +                     throw new RuntimeException("Unable to start multiplexed Channel and property ClusterConfig not set");
  +                  }
                     configuration.setClusterConfig(getDefaultProperties());
                     log.debug("setting cluster properties to default value");
                  }