[jboss-cvs] JBossCache/src/org/jboss/cache/aop/collection ...
Manik Surtani
msurtani at jboss.com
Wed Feb 28 13:36:59 EST 2007
User: msurtani
Date: 07/02/28 13:36:59
Modified: src/org/jboss/cache/aop/collection Tag:
Branch_JBossCache_1_4_0 CachedSetImpl.java
CachedListImpl.java CachedMapImpl.java
CollectionInterceptorUtil.java
Log:
JBCACHE-979
Revision Changes Path
No revision
No revision
1.15.2.2 +8 -0 JBossCache/src/org/jboss/cache/aop/collection/Attic/CachedSetImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CachedSetImpl.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/aop/collection/Attic/CachedSetImpl.java,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -b -r1.15.2.1 -r1.15.2.2
--- CachedSetImpl.java 2 Jan 2007 07:19:05 -0000 1.15.2.1
+++ CachedSetImpl.java 28 Feb 2007 18:36:58 -0000 1.15.2.2
@@ -39,6 +39,8 @@
{
try {
return AopUtil.getNodeChildren(cache_, getFqn());
+ } catch (RuntimeException re) {
+ throw re;
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -84,6 +86,8 @@
try {
cache_.putObject(AopUtil.constructFqn(getFqn(), keyString), Null.toNullObject(o));
return true;
+ } catch (RuntimeException re) {
+ throw re;
} catch (CacheException e) {
throw new RuntimeException(e);
}
@@ -172,6 +176,8 @@
try {
return Null.toNullValue(cache_.getObject(AopUtil.constructFqn(getFqn(), this.key)));
+ } catch (RuntimeException re) {
+ throw re;
} catch (CacheException e) {
throw new RuntimeException(e);
}
@@ -184,6 +190,8 @@
try {
cache_.removeObject(AopUtil.constructFqn(getFqn(), this.key));
+ } catch (RuntimeException re) {
+ throw re;
} catch (CacheException e) {
throw new RuntimeException(e);
}
1.16.2.3 +18 -0 JBossCache/src/org/jboss/cache/aop/collection/Attic/CachedListImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CachedListImpl.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/aop/collection/Attic/CachedListImpl.java,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.3
diff -u -b -r1.16.2.2 -r1.16.2.3
--- CachedListImpl.java 2 Jan 2007 07:19:05 -0000 1.16.2.2
+++ CachedListImpl.java 28 Feb 2007 18:36:58 -0000 1.16.2.3
@@ -44,6 +44,8 @@
{
try {
return AopUtil.getNodeChildren(cache_, getFqn());
+ } catch (RuntimeException re) {
+ throw re;
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -54,6 +56,8 @@
checkIndex(index);
try {
return Null.toNullValue(cache_.getObject(AopUtil.constructFqn(getFqn(), Integer.toString(index))));
+ } catch (RuntimeException re) {
+ throw re;
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -83,6 +87,8 @@
if(index != 0)
checkIndex(index-1); // Since index can be size().
return Null.toNullValue(cache_.putObject(AopUtil.constructFqn(getFqn(), Integer.toString(index)), Null.toNullObject(element)));
+ } catch (RuntimeException re) {
+ throw re;
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -98,6 +104,8 @@
cache_.putObject(AopUtil.constructFqn(getFqn(), Integer.toString(i)), obj);
}
cache_.putObject(AopUtil.constructFqn(getFqn(), Integer.toString(index)), Null.toNullObject(element));
+ } catch (RuntimeException re) {
+ throw re;
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -153,6 +161,8 @@
cache_.putObject(AopUtil.constructFqn(getFqn(), Integer.toString(i)), obj);
}
return result;
+ } catch (RuntimeException re) {
+ throw re;
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -185,6 +195,8 @@
try {
return Null.toNullValue(cache_.getObject(AopUtil.constructFqn(getFqn(), Integer.toString(++current))));
+ } catch (RuntimeException re) {
+ throw re;
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -211,6 +223,8 @@
}
current--;
size--;
+ } catch (RuntimeException re) {
+ throw re;
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -277,6 +291,8 @@
list_.remove(previousIndex());
index--;
}
+ } catch (RuntimeException re) {
+ throw re;
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -394,6 +410,8 @@
current++;
try {
return iter_.next();
+ } catch (RuntimeException re) {
+ throw re;
} catch (Exception e) {
throw new RuntimeException(e);
}
1.15.2.3 +15 -0 JBossCache/src/org/jboss/cache/aop/collection/Attic/CachedMapImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CachedMapImpl.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/aop/collection/Attic/CachedMapImpl.java,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -u -b -r1.15.2.2 -r1.15.2.3
--- CachedMapImpl.java 2 Jan 2007 07:19:05 -0000 1.15.2.2
+++ CachedMapImpl.java 28 Feb 2007 18:36:58 -0000 1.15.2.3
@@ -58,6 +58,8 @@
{
try {
return AopUtil.getNodeChildren(cache_, getFqn());
+ } catch (RuntimeException re) {
+ throw re;
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -67,6 +69,8 @@
{
try {
return Null.toNullValue(cache_.getObject(AopUtil.constructFqn(getFqn(), Null.toNullKeyObject(key))));
+ } catch (RuntimeException re) {
+ throw re;
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -76,6 +80,8 @@
{
try {
return cache_.putObject(AopUtil.constructFqn(getFqn(), Null.toNullKeyObject(key)), Null.toNullObject(value));
+ } catch (RuntimeException re) {
+ throw re;
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -93,6 +99,8 @@
{
try {
return cache_.removeObject(AopUtil.constructFqn(getFqn(), Null.toNullKeyObject(key)));
+ } catch (RuntimeException re) {
+ throw re;
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -214,6 +222,9 @@
{
lastKey = i.next();
return Null.toNullValue(cache_.getObject(AopUtil.constructFqn(getFqn(), lastKey)));
+
+ } catch (RuntimeException re) {
+ throw re;
}
catch (CacheException e)
{
@@ -348,6 +359,8 @@
{
try {
return Null.toNullValue(cache_.getObject(AopUtil.constructFqn(getFqn(), key)));
+ } catch (RuntimeException re) {
+ throw re;
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -357,6 +370,8 @@
{
try {
return cache_.putObject(AopUtil.constructFqn(getFqn(), key), Null.toNullObject(value));
+ } catch (RuntimeException re) {
+ throw re;
} catch (Exception e) {
throw new RuntimeException(e);
}
1.8.2.1 +2 -0 JBossCache/src/org/jboss/cache/aop/collection/Attic/CollectionInterceptorUtil.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CollectionInterceptorUtil.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/aop/collection/Attic/CollectionInterceptorUtil.java,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -b -r1.8 -r1.8.2.1
--- CollectionInterceptorUtil.java 4 May 2006 16:28:12 -0000 1.8
+++ CollectionInterceptorUtil.java 28 Feb 2007 18:36:58 -0000 1.8.2.1
@@ -70,6 +70,8 @@
if (result == null) {
try {
ClassProxyFactory.newInstance(clazz);
+ } catch (RuntimeException re) {
+ throw re;
} catch (Exception e) {
throw new RuntimeException(e);
}
More information about the jboss-cvs-commits
mailing list