Author: markt
Date: Wed Aug 14 12:16:32 2013
New Revision: 1513829
URL: http://svn.apache.org/r1513829
Log:
Tomcat 8 requires Java 7 so simplify code.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1513829&r1=1513828&r2=1513829&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java Wed
Aug 14 12:16:32 2013
@@ -38,7 +38,7 @@ import org.apache.catalina.tribes.Member
import org.apache.catalina.tribes.MembershipService;
import org.apache.catalina.tribes.RemoteProcessException;
import org.apache.catalina.tribes.UniqueId;
-import
org.apache.catalina.tribes.group.interceptors.MessageDispatchInterceptor;
+import
org.apache.catalina.tribes.group.interceptors.MessageDispatch15Interceptor;
import org.apache.catalina.tribes.io.BufferPool;
import org.apache.catalina.tribes.io.ChannelData;
import org.apache.catalina.tribes.io.XByteBuffer;
@@ -370,26 +370,9 @@ public class GroupChannel extends Channe
* @throws ChannelException
*/
protected synchronized void setupDefaultStack() throws ChannelException {
-
- if ( getFirstInterceptor() != null &&
- ((getFirstInterceptor().getNext() instanceof
ChannelCoordinator))) {
- ChannelInterceptor interceptor = null;
- Class<?> clazz = null;
- try {
- clazz = Class.forName(
-
"org.apache.catalina.tribes.group.interceptors.MessageDispatch15Interceptor",
- true, GroupChannel.class.getClassLoader());
- clazz.newInstance();
- } catch ( Throwable x ) {
- clazz = MessageDispatchInterceptor.class;
- }//catch
- try {
- interceptor = (ChannelInterceptor) clazz.newInstance();
- } catch (Exception x) {
- throw new ChannelException(
- "Unable to add MessageDispatchInterceptor to
interceptor chain.", x);
- }
- this.addInterceptor(interceptor);
+ if (getFirstInterceptor() != null &&
+ ((getFirstInterceptor().getNext() instanceof
ChannelCoordinator))) {
+ addInterceptor(new MessageDispatch15Interceptor());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
