From 90cf69238466452125ff9bba094157684e0084a0 Mon Sep 17 00:00:00 2001 From: markt Date: Sun, 22 Nov 2009 22:37:43 +0000 Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47799 Unable to configure domain in Membership and DomainFilterInterceptor Patch provided by Keiichi Fujino git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@883165 13f79535-47bb-0310-9956-ffa450edef68 --- .../tribes/group/interceptors/DomainFilterInterceptor.java | 9 +++++++++ java/org/apache/catalina/tribes/membership/McastService.java | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java b/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java index c29ecc946..f24188842 100644 --- a/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java +++ b/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java @@ -104,4 +104,13 @@ public class DomainFilterInterceptor extends ChannelInterceptorBase { public void setDomain(byte[] domain) { this.domain = domain; } + + public void setDomain(String domain) { + if ( domain == null ) return; + if (domain.startsWith("{")) + setDomain(org.apache.catalina.tribes.util.Arrays.fromString(domain)); + else + setDomain(org.apache.catalina.tribes.util.Arrays.convert(domain)); + } + } diff --git a/java/org/apache/catalina/tribes/membership/McastService.java b/java/org/apache/catalina/tribes/membership/McastService.java index 8f8f83006..0bbbb4cfe 100644 --- a/java/org/apache/catalina/tribes/membership/McastService.java +++ b/java/org/apache/catalina/tribes/membership/McastService.java @@ -30,6 +30,7 @@ import org.apache.catalina.tribes.MembershipService; import org.apache.catalina.tribes.MessageListener; import org.apache.catalina.tribes.io.ChannelData; import org.apache.catalina.tribes.io.XByteBuffer; +import org.apache.catalina.tribes.util.Arrays; import org.apache.catalina.tribes.util.StringManager; import org.apache.catalina.tribes.util.UUIDGenerator; @@ -619,6 +620,12 @@ public class McastService implements MembershipService,MembershipListener,Messag } } + public void setDomain(String domain) { + if ( domain == null ) return; + if ( domain.startsWith("{") ) setDomain(Arrays.fromString(domain)); + else setDomain(Arrays.convert(domain)); + } + /** * Simple test program * @param args Command-line arguments -- 2.11.0