You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kf...@apache.org on 2016/02/16 07:58:46 UTC

svn commit: r1730637 - /tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java

Author: kfujino
Date: Tue Feb 16 06:58:46 2016
New Revision: 1730637

URL: http://svn.apache.org/viewvc?rev=1730637&view=rev
Log:
No-functional change. Remove cast.

Modified:
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1730637&r1=1730636&r2=1730637&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java Tue Feb 16 06:58:46 2016
@@ -94,12 +94,12 @@ public class GroupChannel extends Channe
     /**
      * A list of membership listeners that subscribe to membership announcements
      */
-    protected final List<Object> membershipListeners = new CopyOnWriteArrayList<>();
+    protected final List<MembershipListener> membershipListeners = new CopyOnWriteArrayList<>();
 
     /**
      * A list of channel listeners that subscribe to incoming messages
      */
-    protected final List<Object> channelListeners = new CopyOnWriteArrayList<>();
+    protected final List<ChannelListener> channelListeners = new CopyOnWriteArrayList<>();
 
     /**
      * If set to true, the GroupChannel will check to make sure that
@@ -155,15 +155,15 @@ public class GroupChannel extends Channe
     @Override
     public void heartbeat() {
         super.heartbeat();
-        Iterator<Object> i = membershipListeners.iterator();
-        while ( i.hasNext() ) {
-            Object o = i.next();
-            if ( o instanceof Heartbeat ) ((Heartbeat)o).heartbeat();
+        Iterator<MembershipListener> membershipListenerIterator = membershipListeners.iterator();
+        while ( membershipListenerIterator.hasNext() ) {
+            MembershipListener listener = membershipListenerIterator.next();
+            if ( listener instanceof Heartbeat ) ((Heartbeat)listener).heartbeat();
         }
-        i = channelListeners.iterator();
-        while ( i.hasNext() ) {
-            Object o = i.next();
-            if ( o instanceof Heartbeat ) ((Heartbeat)o).heartbeat();
+        Iterator<ChannelListener> channelListenerIterator = channelListeners.iterator();
+        while ( channelListenerIterator.hasNext() ) {
+            ChannelListener listener = channelListenerIterator.next();
+            if ( listener instanceof Heartbeat ) ((Heartbeat)listener).heartbeat();
         }
 
     }
@@ -291,7 +291,7 @@ public class GroupChannel extends Channe
             boolean rx = false;
             boolean delivered = false;
             for ( int i=0; i<channelListeners.size(); i++ ) {
-                ChannelListener channelListener = (ChannelListener)channelListeners.get(i);
+                ChannelListener channelListener = channelListeners.get(i);
                 if (channelListener != null && channelListener.accept(fwd, source)) {
                     channelListener.messageReceived(fwd, source);
                     delivered = true;
@@ -346,7 +346,7 @@ public class GroupChannel extends Channe
     public void memberAdded(Member member) {
         //notify upwards
         for (int i=0; i<membershipListeners.size(); i++ ) {
-            MembershipListener membershipListener = (MembershipListener)membershipListeners.get(i);
+            MembershipListener membershipListener = membershipListeners.get(i);
             if (membershipListener != null) membershipListener.memberAdded(member);
         }
     }
@@ -360,7 +360,7 @@ public class GroupChannel extends Channe
     public void memberDisappeared(Member member) {
         //notify upwards
         for (int i=0; i<membershipListeners.size(); i++ ) {
-            MembershipListener membershipListener = (MembershipListener)membershipListeners.get(i);
+            MembershipListener membershipListener = membershipListeners.get(i);
             if (membershipListener != null) membershipListener.memberDisappeared(member);
         }
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org