[jboss-cvs] JBossAS SVN: r92378 - projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 14 11:08:16 EDT 2009
Author: bstansberry at jboss.com
Date: 2009-08-14 11:08:15 -0400 (Fri, 14 Aug 2009)
New Revision: 92378
Modified:
projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/AbstractJBossCacheService.java
projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/JBossCacheWrapper.java
Log:
[JBCLUSTER-238] Don't assume Fqn<String>, "dead" trees use Integer
Modified: projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/AbstractJBossCacheService.java
===================================================================
--- projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/AbstractJBossCacheService.java 2009-08-14 13:45:05 UTC (rev 92377)
+++ projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/AbstractJBossCacheService.java 2009-08-14 15:08:15 UTC (rev 92378)
@@ -465,8 +465,8 @@
}
else
{
- List<Fqn<String>> fqns = getBuddyBackupSessionFqns(dataOwner, combinedPath_, realId);
- for (Fqn<String> fqn : fqns)
+ List<Fqn<Object>> fqns = getBuddyBackupSessionFqns(dataOwner, combinedPath_, realId);
+ for (Fqn<Object> fqn : fqns)
{
if (log_.isTraceEnabled())
{
@@ -495,8 +495,8 @@
}
else
{
- List<Fqn<String>> fqns = getBuddyBackupSessionFqns(dataOwner, combinedPath_, realId);
- for (Fqn<String> fqn : fqns)
+ List<Fqn<Object>> fqns = getBuddyBackupSessionFqns(dataOwner, combinedPath_, realId);
+ for (Fqn<Object> fqn : fqns)
{
if(log_.isTraceEnabled())
{
@@ -517,8 +517,8 @@
}
else
{
- List<Fqn<String>> fqns = getBuddyBackupSessionFqns(dataOwner, combinedPath_, realId);
- for (Fqn<String> fqn : fqns)
+ List<Fqn<Object>> fqns = getBuddyBackupSessionFqns(dataOwner, combinedPath_, realId);
+ for (Fqn<Object> fqn : fqns)
{
distributedCacheData = cacheWrapper_.getData(fqn, false);
// Above call will return an empty map if fqn doesn't exist;
@@ -719,11 +719,11 @@
}
}
- private List<Fqn<String>> getBuddyBackupSessionFqns(String dataOwner, String contextHostPath, String sessionId)
+ private List<Fqn<Object>> getBuddyBackupSessionFqns(String dataOwner, String contextHostPath, String sessionId)
{
- List<Fqn<String>> result = new ArrayList<Fqn<String>>();
+ List<Fqn<Object>> result = new ArrayList<Fqn<Object>>();
// First, just assume a non-dead tree exists
- String[] objs = new String[]{BUDDY_BACKUP, dataOwner, SESSION, contextHostPath, sessionId};
+ Object[] objs = new Object[]{BUDDY_BACKUP, dataOwner, SESSION, contextHostPath, sessionId};
result.add(Fqn.fromList(Arrays.asList(objs), true));
// Now append any "dead" trees associated with this owner
@@ -732,7 +732,7 @@
Set<Object> buddies = plainCache_.getChildrenNames(dead); // won't return null
for (Object child : buddies)
{
- objs = new String[]{BUDDY_BACKUP, deadBuddy, (String) child, SESSION, contextHostPath, sessionId};
+ objs = new Object[]{BUDDY_BACKUP, deadBuddy, (String) child, SESSION, contextHostPath, sessionId};
result.add(Fqn.fromList(Arrays.asList(objs), true));
}
return result;
Modified: projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/JBossCacheWrapper.java
===================================================================
--- projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/JBossCacheWrapper.java 2009-08-14 13:45:05 UTC (rev 92377)
+++ projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/JBossCacheWrapper.java 2009-08-14 15:08:15 UTC (rev 92378)
@@ -40,7 +40,7 @@
plainCache_ = cache;
}
- Map<Object, Object> getData(Fqn<String> fqn, boolean gravitate)
+ Map<Object, Object> getData(Fqn<?> fqn, boolean gravitate)
{
TimeoutException ex = null;
for (int i = 0; i < RETRY; i++)
@@ -69,7 +69,7 @@
* @param id
* @return
*/
- Object get(Fqn<String> fqn, String id)
+ Object get(Fqn<?> fqn, String id)
{
return get(fqn, id, false);
}
@@ -81,7 +81,7 @@
* @param id
* @return
*/
- Object get(Fqn<String> fqn, String id, boolean gravitate)
+ Object get(Fqn<?> fqn, String id, boolean gravitate)
{
TimeoutException ex = null;
for (int i = 0; i < RETRY; i++)
@@ -112,7 +112,7 @@
* @param value
* @return
*/
- void put(Fqn<String> fqn, String id, Object value)
+ void put(Fqn<?> fqn, String id, Object value)
{
TimeoutException ex = null;
for (int i = 0; i < RETRY; i++)
@@ -138,7 +138,7 @@
* @param fqn
* @param map
*/
- void put(Fqn<String> fqn, Map<Object, Object> map)
+ void put(Fqn<?> fqn, Map<Object, Object> map)
{
TimeoutException ex = null;
for (int i = 0; i < RETRY; i++)
@@ -164,7 +164,7 @@
* @param id
* @return
*/
- Object remove(Fqn<String> fqn, String id)
+ Object remove(Fqn<?> fqn, String id)
{
TimeoutException ex = null;
for (int i = 0; i < RETRY; i++)
@@ -189,7 +189,7 @@
* @param id
* @return
*/
- Object removeLocal(Fqn<String> fqn, String id)
+ Object removeLocal(Fqn<?> fqn, String id)
{
TimeoutException ex = null;
for (int i = 0; i < RETRY; i++)
@@ -214,7 +214,7 @@
*
* @param fqn
*/
- void remove(Fqn<String> fqn)
+ void remove(Fqn<?> fqn)
{
TimeoutException ex = null;
for (int i = 0; i < RETRY; i++)
@@ -238,7 +238,7 @@
*
* @param fqn
*/
- void removeLocal(Fqn<String> fqn)
+ void removeLocal(Fqn<?> fqn)
{
TimeoutException ex = null;
for (int i = 0; i < RETRY; i++)
@@ -259,7 +259,7 @@
throw new RuntimeException(RETRY_FAIL_MSG, ex);
}
- void evictSubtree(Fqn<String> fqn)
+ void evictSubtree(Fqn<?> fqn)
{
TimeoutException ex = null;
for (int i = 0; i < RETRY; i++)
More information about the jboss-cvs-commits
mailing list