[jboss-cvs] JBossAS SVN: r107236 - in projects/cluster/ha-server-ispn/trunk/src: test/java/org/jboss/ha/ispn and 1 other directory.

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

Author: pferraro
Date: 2010-07-30 09:35:49 -0400 (Fri, 30 Jul 2010)
New Revision: 107236

Modified:
   projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerRegistry.java
   projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerRegistryTest.java
Log:
getInstace() returns null, instead of ISE if not yet started.

Modified: projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerRegistry.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerRegistry.java	2010-07-30 13:32:09 UTC (rev 107235)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerRegistry.java	2010-07-30 13:35:49 UTC (rev 107236)
@@ -54,9 +54,7 @@
    
    public static CacheContainerRegistry getInstance()
    {
-      CacheContainerRegistry registry = singleton.get();
-      if (registry == null) throw new IllegalStateException("Cache container registry not configured.");
-      return registry;
+      return singleton.get();
    }
    
    private final CacheContainerFactory factory;

Modified: projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerRegistryTest.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerRegistryTest.java	2010-07-30 13:32:09 UTC (rev 107235)
+++ projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerRegistryTest.java	2010-07-30 13:35:49 UTC (rev 107236)
@@ -56,19 +56,8 @@
       
       DefaultCacheContainerRegistry registry = new DefaultCacheContainerRegistry(factory, source, context);
       
-      IllegalStateException exception = null;
+      Assert.assertNull(DefaultCacheContainerRegistry.getInstance());
       
-      try
-      {
-         DefaultCacheContainerRegistry.getInstance();
-      }
-      catch (IllegalStateException e)
-      {
-         exception = e;
-      }
-      
-      Assert.assertNotNull(exception);
-      
       EasyMock.expect(source.getRegistryConfiguration()).andReturn(configRegistry);
       
       EasyMock.expect(factory.createCacheContainer(EasyMock.capture(capturedConfiguration), EasyMock.eq(Collections.<String, String>emptyMap()))).andReturn(defaultCacheManager);
@@ -129,18 +118,9 @@
       registry.stop();
       
       EasyMock.verify(factory, source, context, defaultCacheManager, otherCacheManager);
+
+      Assert.assertNull(DefaultCacheContainerRegistry.getInstance());
       
-      exception = null;
-      
-      try
-      {
-         DefaultCacheContainerRegistry.getInstance();
-      }
-      catch (IllegalStateException e)
-      {
-         exception = e;
-      }
-      
       EasyMock.reset(factory, source, context, defaultCacheManager, otherCacheManager);
    }
    
@@ -188,19 +168,8 @@
       
       DefaultCacheContainerRegistry registry = new DefaultCacheContainerRegistry(factory, provider, context);
       
-      IllegalStateException exception = null;
+      Assert.assertNull(DefaultCacheContainerRegistry.getInstance());
       
-      try
-      {
-         DefaultCacheContainerRegistry.getInstance();
-      }
-      catch (IllegalStateException e)
-      {
-         exception = e;
-      }
-      
-      Assert.assertNotNull(exception);
-      
       EasyMock.expect(provider.getRegistryConfiguration()).andReturn(configRegistry);
       
       EasyMock.expect(factory.createCacheContainer(EasyMock.capture(capturedConfiguration), EasyMock.eq(Collections.singletonMap("legacy-other-cache", "other-cache")))).andReturn(otherCacheManager);
@@ -261,19 +230,8 @@
       
       EasyMock.verify(factory, context, defaultCacheManager, otherCacheManager);
       
-      exception = null;
+      Assert.assertNull(DefaultCacheContainerRegistry.getInstance());
       
-      try
-      {
-         DefaultCacheContainerRegistry.getInstance();
-      }
-      catch (IllegalStateException e)
-      {
-         exception = e;
-      }
-      
-      Assert.assertNotNull(exception);
-      
       EasyMock.reset(factory, context, defaultCacheManager, otherCacheManager);
    }
 }