[jboss-cvs] JBossAS SVN: r109002 - in projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss: web/tomcat/service/session/distributedcache/ispn and 1 other directories.

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

Author: pferraro
Date: 2010-10-29 11:59:29 -0400 (Fri, 29 Oct 2010)
New Revision: 109002

Modified:
   projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/framework/server/ispn/DistributedState.java
   projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DistributedCacheManager.java
   projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/sso/ispn/SSOClusterManager.java
Log:
Utilize generic cache events

Modified: projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/framework/server/ispn/DistributedState.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/framework/server/ispn/DistributedState.java	2010-10-29 15:58:11 UTC (rev 109001)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/framework/server/ispn/DistributedState.java	2010-10-29 15:59:29 UTC (rev 109002)
@@ -495,31 +495,31 @@
    // @CacheListener  -------------------------------------------------
 
    @CacheEntryModified
-   public void nodeModified(CacheEntryModifiedEvent event)
+   public void nodeModified(CacheEntryModifiedEvent<Serializable, Serializable> event)
    {
       if (event.isPre()) return;
 
-      Object key = event.getKey();
+      Serializable key = event.getKey();
       
       if (key instanceof SimpleImmutableEntry)
       {
          @SuppressWarnings("unchecked")
          SimpleImmutableEntry<String, Serializable> entry = (SimpleImmutableEntry<String, Serializable>) key;
-         notifyKeyListeners(entry.getKey(), entry.getValue(), (Serializable) event.getValue(), event.isOriginLocal());
+         notifyKeyListeners(entry.getKey(), entry.getValue(), event.getValue(), event.isOriginLocal());
       }
    }
 
    @CacheEntryRemoved
-   public void nodeRemoved(CacheEntryRemovedEvent event)
+   public void nodeRemoved(CacheEntryRemovedEvent<Serializable, Serializable> event)
    {
       if (event.isPre()) return;
-      Object key = event.getKey();
+      Serializable key = event.getKey();
 
       if (key instanceof SimpleImmutableEntry)
       {
          @SuppressWarnings("unchecked")
          SimpleImmutableEntry<String, Serializable> entry = (SimpleImmutableEntry<String, Serializable>) key;
-         notifyKeyListenersOfRemove(entry.getKey(), entry.getValue(), (Serializable) event.getValue(), event.isOriginLocal());
+         notifyKeyListenersOfRemove(entry.getKey(), entry.getValue(), event.getValue(), event.isOriginLocal());
       }
    }
 

Modified: projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DistributedCacheManager.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DistributedCacheManager.java	2010-10-29 15:58:11 UTC (rev 109001)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DistributedCacheManager.java	2010-10-29 15:59:29 UTC (rev 109002)
@@ -507,7 +507,7 @@
    }
 
    @CacheEntryRemoved
-   public void removed(CacheEntryRemovedEvent event)
+   public void removed(CacheEntryRemovedEvent<String, Map<Object, Object>> event)
    {
       if (event.isPre() || event.isOriginLocal()) return;
       
@@ -515,12 +515,11 @@
    }
    
    @CacheEntryModified
-   public void modified(CacheEntryModifiedEvent event)
+   public void modified(CacheEntryModifiedEvent<String, Map<Object, Object>> event)
    {
       if (event.isPre() || event.isOriginLocal()) return;
       
-      @SuppressWarnings("unchecked")
-      Map<Object, Object> map = (Map<Object, Object>) event.getValue();
+      Map<Object, Object> map = event.getValue();
       
       if (map.isEmpty()) return;
       
@@ -542,7 +541,7 @@
    }
    
    @CacheEntryActivated
-   public void activated(CacheEntryActivatedEvent event)
+   public void activated(CacheEntryActivatedEvent<String, Map<Object, Object>> event)
    {
       if (event.isPre()) return;
 

Modified: projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/sso/ispn/SSOClusterManager.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/sso/ispn/SSOClusterManager.java	2010-10-29 15:58:11 UTC (rev 109001)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/sso/ispn/SSOClusterManager.java	2010-10-29 15:59:29 UTC (rev 109002)
@@ -504,11 +504,11 @@
     * @param event
     */
    @CacheEntryRemoved
-   public void cacheEntryRemoved(CacheEntryRemovedEvent event)
+   public void cacheEntryRemoved(CacheEntryRemovedEvent<SSOKey, ?> event)
    {
       if (event.isPre()) return;
 
-      SSOKey key = (SSOKey) event.getKey();
+      SSOKey key = event.getKey();
       String ssoId = key.getId();
 
       if (ssoId == null || !(key instanceof SessionKey))
@@ -672,12 +672,12 @@
     * @param event
     */
    @CacheEntryModified
-   public void cacheEntryModified(CacheEntryModifiedEvent event)
+   public void cacheEntryModified(CacheEntryModifiedEvent<SSOKey, ?> event)
    {
       if (event.isPre() || event.isOriginLocal())
          return;
 
-      SSOKey key = (SSOKey) event.getKey();
+      SSOKey key = event.getKey();
       String ssoId = key.getId();
       
       if (key instanceof CredentialKey)