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

[Brian Stansberry]

  User: bstansberry
  Date: 06/11/10 00:59:22

  Modified:    src/org/jboss/cache/config  Configuration.java
  Log:
  Lazy initialize RuntimeConfig
  
  Revision  Changes    Path
  1.26      +17 -20    JBossCache/src/org/jboss/cache/config/Configuration.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Configuration.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/config/Configuration.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -b -r1.25 -r1.26
  --- Configuration.java	10 Nov 2006 04:40:28 -0000	1.25
  +++ Configuration.java	10 Nov 2006 05:59:22 -0000	1.26
  @@ -6,10 +6,6 @@
    */
   package org.jboss.cache.config;
   
  -import java.io.IOException;
  -import java.io.ObjectInputStream;
  -import java.io.ObjectOutputStream;
  -
   import org.jboss.cache.TreeCache;
   import org.jboss.cache.Version;
   import org.jboss.cache.factories.XmlConfigurationParser;
  @@ -505,17 +501,26 @@
         return serviceName;
      }
   
  -
  -   public RuntimeConfig getRuntimeConfig()
  +   public synchronized RuntimeConfig getRuntimeConfig()
      {
  +      if (runtimeConfig == null)
  +      {
  +         setRuntimeConfig(new RuntimeConfig(), false);
  +      }
         return runtimeConfig;
      }
   
      public void setRuntimeConfig(RuntimeConfig runtimeConfig)
      {
  -      this.runtimeConfig = runtimeConfig;
  +      setRuntimeConfig(runtimeConfig, true);
      }
      
  +   private void setRuntimeConfig(RuntimeConfig runtimeConfig, boolean testImmutability)
  +   {
  +      if (testImmutability)
  +         testImmutability("runtimeConfig");
  +      this.runtimeConfig = runtimeConfig;
  +   }
      
   
      // ------------------------------------------------------------------------------------------------------------
  @@ -629,19 +634,11 @@
         {
            c.setCacheLoaderConfig((CacheLoaderConfig) cacheLoaderConfig.clone());
         }
  -      return c;
  -   }
  -
  -   private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException
  +      if (runtimeConfig != null)
      {
  -      in.defaultReadObject();
  -      runtimeConfig = new RuntimeConfig();
  +         c.setRuntimeConfig((RuntimeConfig) runtimeConfig.clone());
      }
  -
  -   private void writeObject(ObjectOutputStream out) throws IOException
  -   {
  -      out.defaultWriteObject();      
  +      return c;
      }
      
  -   
   }