[jboss-cvs] JBossAS SVN: r109454 - trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/session.

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

Author: pferraro
Date: 2010-11-24 13:04:04 -0500 (Wed, 24 Nov 2010)
New Revision: 109454

Modified:
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheManager.java
Log:
[JBAS-8661] Web application with <distributable/> fails to deploy on "default" profile
Defer throwing ClusteringNotSupportException until init(...)

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheManager.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheManager.java	2010-11-24 17:59:57 UTC (rev 109453)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheManager.java	2010-11-24 18:04:04 UTC (rev 109454)
@@ -188,14 +188,10 @@
    
    //  ----------------------------------------------------------  Constructors
 
-   public JBossCacheManager() throws ClusteringNotSupportedException
+   public JBossCacheManager()
    {
-      if (defaultFactory == null)
-      {
-         throw new ClusteringNotSupportedException("No DistributedCacheManagerFactory service provider found.");
-      }
-      
-      this.distributedCacheManagerFactory = defaultFactory;
+      // JBAS-8661 Defer throwing ClusteringNotSupportedException until init(...)
+      this(defaultFactory);
    }
    
    public JBossCacheManager(DistributedCacheManagerFactory factory)
@@ -216,6 +212,11 @@
    public void init(String name, JBossWebMetaData webMetaData)
       throws ClusteringNotSupportedException
    {
+      if (this.distributedCacheManagerFactory == null)
+      {
+         throw new ClusteringNotSupportedException("No DistributedCacheManagerFactory service provider found.");
+      }
+      
       super.init(name, webMetaData);
       
       this.replicationConfig_ = webMetaData.getReplicationConfig();