[jboss-cvs] JBossCache/src/org/jboss/cache ...
Manik Surtani
msurtani at jboss.com
Wed Nov 15 18:48:31 EST 2006
User: msurtani
Date: 06/11/15 18:48:31
Modified: src/org/jboss/cache TreeCache.java RegionImpl.java
Region.java RegionManager.java
Log:
Fixed some failing UTs
Revision Changes Path
1.271 +5 -3 JBossCache/src/org/jboss/cache/TreeCache.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TreeCache.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TreeCache.java,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -b -r1.270 -r1.271
--- TreeCache.java 15 Nov 2006 16:30:38 -0000 1.270
+++ TreeCache.java 15 Nov 2006 23:48:31 -0000 1.271
@@ -94,7 +94,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: TreeCache.java,v 1.270 2006/11/15 16:30:38 msurtani Exp $
+ * @version $Id: TreeCache.java,v 1.271 2006/11/15 23:48:31 msurtani Exp $
* <p/>
* @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
*/
@@ -564,8 +564,10 @@
{
if (sources == null || sources.length<1 || stateId == null)
{
- throw new IllegalArgumentException("Cannot fetch partial state, targets are " + sources + " and stateId is "
- + stateId);
+ // should this really be throwing an exception? Are there valid use cases where partial state may not be available? - Manik
+ //throw new IllegalArgumentException("Cannot fetch partial state, targets are " + sources + " and stateId is " + stateId);
+ if (log.isWarnEnabled()) log.warn("Cannot fetch partial state, targets are " + sources + " and stateId is " + stateId);
+ return;
}
ArrayList targets = new ArrayList(Arrays.asList(sources));
1.13 +7 -2 JBossCache/src/org/jboss/cache/RegionImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RegionImpl.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/RegionImpl.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- RegionImpl.java 15 Nov 2006 17:01:36 -0000 1.12
+++ RegionImpl.java 15 Nov 2006 23:48:31 -0000 1.13
@@ -73,13 +73,13 @@
public void activate()
{
- regionManager.activate(fqn.toString());
+ regionManager.activate(fqn);
active = true;
}
public void deactivate()
{
- regionManager.deactivate(fqn.toString());
+ regionManager.deactivate(fqn);
active = false;
}
@@ -98,6 +98,11 @@
return fqn;
}
+ public void setActive(boolean b)
+ {
+ active = b;
+ }
+
// -------- eviction stuff -----
1.8 +7 -0 JBossCache/src/org/jboss/cache/Region.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Region.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/Region.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Region.java 15 Nov 2006 15:16:40 -0000 1.7
+++ Region.java 15 Nov 2006 23:48:31 -0000 1.8
@@ -100,4 +100,11 @@
void unmarkNodeCurrentlyInUse(Fqn fqn);
Fqn getFqn();
+
+ /**
+ * Sets this region as active - this only marks a flag and does not activate the region. Use {@link #activate()}
+ * and {@link #deactivate()} for the full process.
+ * @param b
+ */
+ void setActive(boolean b);
}
1.9 +54 -26 JBossCache/src/org/jboss/cache/RegionManager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RegionManager.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/RegionManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- RegionManager.java 15 Nov 2006 17:01:36 -0000 1.8
+++ RegionManager.java 15 Nov 2006 23:48:31 -0000 1.9
@@ -233,6 +233,8 @@
*/
public void activate(Fqn fqn)
{
+ try
+ {
if (log.isTraceEnabled()) log.trace("Activating region " + fqn);
Region r = getRegion(fqn, false);
if (r != null)
@@ -245,14 +247,22 @@
}
else
{
- r.activate();
+ //r.activate();
+ r.setActive(true);
+ if (treeCache.getConfiguration().isFetchInMemoryState()) treeCache.activateRegion(r.getFqn().toString());
}
}
else if (defaultInactive)
{
// "Active" region is not the default, so create a region
r = getRegion(fqn, true);
- r.activate();
+ r.setActive(true);
+ if (treeCache.getConfiguration().isFetchInMemoryState()) treeCache.activateRegion(r.getFqn().toString());
+ }
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
}
}
@@ -292,6 +302,8 @@
*/
public void deactivate(Fqn fqn)
{
+ try
+ {
Region region = getRegion(fqn, false);
if (region != null)
@@ -304,13 +316,21 @@
}
else
{
- region.deactivate();
+ //region.deactivate();
+ region.setActive(false);
+ if (treeCache.getConfiguration().isFetchInMemoryState()) treeCache.inactivateRegion(fqn.toString());
}
}
else if (!defaultInactive)
{
region = getRegion(fqn, true);
- region.deactivate();
+ region.setActive(false);
+ if (treeCache.getConfiguration().isFetchInMemoryState()) treeCache.inactivateRegion(fqn.toString());
+ }
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
}
}
@@ -326,6 +346,14 @@
}
/**
+ * Resets the region manager's regions registry
+ */
+ public void reset()
+ {
+ regionsRegistry.clear();
+ }
+
+ /**
* Note that the ordered list returned is sorted according to the natural order defined in the {@link Comparable} interface, which {@link org.jboss.cache.Region} extends.
*
* @return an ordered list of all active regions with registered context class loaders.
@@ -417,7 +445,7 @@
* @author Ben Wang 02-2004
* @author Daniel Huang (dhuang at jboss.org)
* @author Brian Stansberry
- * @version $Id: RegionManager.java,v 1.8 2006/11/15 17:01:36 msurtani Exp $
+ * @version $Id: RegionManager.java,v 1.9 2006/11/15 23:48:31 msurtani Exp $
*/
/*public class ERegionManager
{
More information about the jboss-cvs-commits
mailing list