[jboss-cvs] JBossAS SVN: r111855 - projects/ejb3/tags/jboss-ejb3-proxy-clustered-1.0.3/src/main/java/org/jboss/ejb3/proxy/clustered/registry.

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

Author: bmaxwell
Date: 2011-07-26 18:48:38 -0400 (Tue, 26 Jul 2011)
New Revision: 111855

Modified:
   projects/ejb3/tags/jboss-ejb3-proxy-clustered-1.0.3/src/main/java/org/jboss/ejb3/proxy/clustered/registry/ProxyClusteringRegistry.java
Log:
Reverting previous commit and going back to revision 97083

Modified: projects/ejb3/tags/jboss-ejb3-proxy-clustered-1.0.3/src/main/java/org/jboss/ejb3/proxy/clustered/registry/ProxyClusteringRegistry.java
===================================================================
--- projects/ejb3/tags/jboss-ejb3-proxy-clustered-1.0.3/src/main/java/org/jboss/ejb3/proxy/clustered/registry/ProxyClusteringRegistry.java	2011-07-26 22:23:11 UTC (rev 111854)
+++ projects/ejb3/tags/jboss-ejb3-proxy-clustered-1.0.3/src/main/java/org/jboss/ejb3/proxy/clustered/registry/ProxyClusteringRegistry.java	2011-07-26 22:48:38 UTC (rev 111855)
@@ -81,11 +81,7 @@
    private Map<String, ProxyClusteringInfo> beanInfosByProxyFactory = new ConcurrentHashMap<String, ProxyClusteringInfo>();
    /** HATargets for each container, stored in a map keyed by family name */
    private ConcurrentMap<String, Map<String, HATarget>> haTargetsByContainerName = new ConcurrentHashMap<String, Map<String, HATarget>>();
-
-   /* JBPAPP-6869 - configure default load balance policy */
-   private Class defaultLoadBalancePolicyClass = RoundRobin.class;
-   private Class defaultStickyLoadBalancePolicyClass = FirstAvailable.class;
-
+   
    // --------------------------------------------------------------------------------||
    // Required Implementations -------------------------------------------------------||
    // --------------------------------------------------------------------------------||
@@ -275,27 +271,6 @@
       this.loadBalancePolicies = loadBalancePolicies;
    }
 
-   public String getDefaultLoadBalancePolicy()
-   {
-      return defaultLoadBalancePolicyClass.getName();
-   }
-   public void setDefaultLoadBalancePolicy(String defaultLoadBalancePolicy)
-   {
-      log.debug("Changing default Load Balance Policy to " + defaultLoadBalancePolicy);
-      this.defaultLoadBalancePolicyClass = classForPolicy(defaultLoadBalancePolicy);
-   }
-   
-   public String getDefaultStickyLoadBalancePolicy()
-   {
-      return defaultStickyLoadBalancePolicyClass.getName();
-   }
-   
-   public void setDefaultStickyLoadBalancePolicy(String defaultStickyLoadBalancePolicy)
-   {
-      log.debug("Changing default Sticky Load Balance Policy to " + defaultStickyLoadBalancePolicy);
-      this.defaultStickyLoadBalancePolicyClass = classForPolicy(defaultStickyLoadBalancePolicy);
-   }
-
    // --------------------------------------------------------------------------------||
    // Private ------------------------------------------------------------------------||
    // --------------------------------------------------------------------------------||
@@ -316,16 +291,46 @@
    {
       if (lbpClassKey == null || lbpClassKey.length() == 0 || lbpClassKey.equals(ClusteredDefaults.LOAD_BALANCE_POLICY_DEFAULT))
       {
-         //return defaultSticky ? FirstAvailable.class : RoundRobin.class;
-         return defaultSticky ? defaultStickyLoadBalancePolicyClass : defaultLoadBalancePolicyClass;
+         return defaultSticky ? FirstAvailable.class : RoundRobin.class;
       }
       else
       {
          Class<LoadBalancePolicy> lbPolicyClass = loadBalancePolicies == null ? null : loadBalancePolicies.get(lbpClassKey);
-
          if (lbPolicyClass == null)
-            lbPolicyClass = classForPolicy(lbpClassKey);
-
+         {
+            // Try to use the string as a classname
+            String className = lbpClassKey;
+            
+            // If it's a simple string, prepend a standard package
+            if (lbpClassKey.indexOf('.') < 0)
+            {
+               className = RoundRobin.class.getPackage().getName() + "." + lbpClassKey;
+            }
+            
+            try
+            {
+               lbPolicyClass = (Class<LoadBalancePolicy>) Thread.currentThread().getContextClassLoader().loadClass(className);
+            }
+            catch (ClassNotFoundException e)
+            {
+               // If it's a simple string, prepend a different standard package
+               if (lbpClassKey.indexOf('.') < 0)
+               {
+                  className = FirstAvailable.class.getPackage().getName() + "." + lbpClassKey;
+                  try
+                  {
+                     lbPolicyClass = (Class<LoadBalancePolicy>) Thread.currentThread().getContextClassLoader().loadClass(className);
+                  }
+                  catch (ClassNotFoundException ignored) {}
+               }
+               
+               if (lbPolicyClass == null)
+               {
+                  throw new IllegalStateException("Cannot determine LoadBalancePolicy class for key " + lbpClassKey);
+               }
+            }
+         }
+         
          return lbPolicyClass;
       }      
    }
@@ -342,40 +347,6 @@
       Map<String, HATarget> containerMap = getHATargets(containerName);      
       containerMap.put(familyName, info.getHaTarget());
    }
-
-   private Class classForPolicy(String lbpClassKey)
-   {
-      String className = lbpClassKey;
-      Class lbPolicyClass = null;
-
-      // If it's a simple string, prepend a standard package
-      if (lbpClassKey.indexOf('.') < 0)
-      {
-         className = RoundRobin.class.getPackage().getName() + "." + lbpClassKey;
-      }
-      try
-      {
-         lbPolicyClass = (Class<LoadBalancePolicy>) Thread.currentThread().getContextClassLoader().loadClass(className);
-      }
-      catch (ClassNotFoundException e)
-      {
-         // If it's a simple string, prepend a different standard package
-         if (lbpClassKey.indexOf('.') < 0)
-         {
-            className = FirstAvailable.class.getPackage().getName() + "." + lbpClassKey;
-            try
-            {
-               lbPolicyClass = (Class<LoadBalancePolicy>) Thread.currentThread().getContextClassLoader().loadClass(className);
-            }
-            catch (ClassNotFoundException ignored) {}
-         }
-         if (lbPolicyClass == null)
-         {
-            throw new IllegalStateException("Cannot determine LoadBalancePolicy class for key " + lbpClassKey);
-         }
-      }
-      return lbPolicyClass;
-   }
    
    public static String getPartitionName(ClusterConfigMetaData metadata)
    {