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/04/12 09:42:09 UTC
svn commit: r1738717 - in /tomcat/tc8.5.x/trunk:
java/org/apache/catalina/tribes/ChannelInterceptor.java
java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
java/org/apache/catalina/tribes/group/GroupChannel.java
webapps/docs/changelog.xml
Author: kfujino
Date: Tue Apr 12 07:42:09 2016
New Revision: 1738717
URL: http://svn.apache.org/viewvc?rev=1738717&view=rev
Log:
Add get/set method for the channel that is related to ChannelInterceptor.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java?rev=1738717&r1=1738716&r2=1738717&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java Tue Apr 12 07:42:09 2016
@@ -168,6 +168,18 @@ public interface ChannelInterceptor exte
public void fireInterceptorEvent(InterceptorEvent event);
+ /**
+ * Return the channel that is related to this interceptor
+ * @return Channel
+ */
+ public Channel getChannel();
+
+ /**
+ * Set the channel that is related to this interceptor
+ * @param channel
+ */
+ public void setChannel(Channel channel);
+
interface InterceptorEvent {
int getEventType();
String getEventTypeDesc();
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java?rev=1738717&r1=1738716&r2=1738717&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java Tue Apr 12 07:42:09 2016
@@ -16,6 +16,7 @@
*/
package org.apache.catalina.tribes.group;
+import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.ChannelException;
import org.apache.catalina.tribes.ChannelInterceptor;
import org.apache.catalina.tribes.ChannelMessage;
@@ -28,6 +29,7 @@ public abstract class ChannelInterceptor
private ChannelInterceptor next;
private ChannelInterceptor previous;
+ private Channel channel;
//default value, always process
protected int optionFlag = 0;
@@ -176,5 +178,22 @@ public abstract class ChannelInterceptor
//empty operation
}
+ /**
+ * Return the channel that is related to this interceptor
+ * @return Channel
+ */
+ @Override
+ public Channel getChannel() {
+ return channel;
+ }
+
+ /**
+ * Set the channel that is related to this interceptor
+ * @param channel
+ */
+ @Override
+ public void setChannel(Channel channel) {
+ this.channel = channel;
+ }
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1738717&r1=1738716&r2=1738717&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java Tue Apr 12 07:42:09 2016
@@ -129,11 +129,13 @@ public class GroupChannel extends Channe
*/
@Override
public void addInterceptor(ChannelInterceptor interceptor) {
+ interceptor.setChannel(this);
if ( interceptors == null ) {
interceptors = interceptor;
interceptors.setNext(coordinator);
interceptors.setPrevious(null);
coordinator.setPrevious(interceptors);
+ coordinator.setChannel(this);
} else {
ChannelInterceptor last = interceptors;
while ( last.getNext() != coordinator ) {
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1738717&r1=1738716&r2=1738717&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Tue Apr 12 07:42:09 2016
@@ -212,6 +212,10 @@
Fix potential NPE that depends on the setting order of attributes of
static member when using the static cluster. (kfujino)
</fix>
+ <add>
+ Add get/set method for the channel that is related to
+ <code>ChannelInterceptor</code>. (kfujino)
+ </add>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org