Skip to content

Commit

Permalink
Code clean-up - no functional change
Browse files Browse the repository at this point in the history
  • Loading branch information
markt-asf committed May 10, 2024
1 parent 508e703 commit b595fdf
Show file tree
Hide file tree
Showing 16 changed files with 772 additions and 755 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
/**
* Filters membership based on domain.
*/
public class DomainFilterInterceptor extends ChannelInterceptorBase
implements DomainFilterInterceptorMBean {
public class DomainFilterInterceptor extends ChannelInterceptorBase implements DomainFilterInterceptorMBean {

private static final Log log = LogFactory.getLog(DomainFilterInterceptor.class);
protected static final StringManager sm = StringManager.getManager(DomainFilterInterceptor.class);
Expand All @@ -53,66 +52,66 @@ public void messageReceived(ChannelMessage msg) {
}
}
}
}//messageReceived
}// messageReceived


@Override
public void memberAdded(Member member) {
if ( membership == null ) {
if (membership == null) {
setupMembership();
}
boolean notify = false;
synchronized (membership) {
notify = Arrays.equals(domain,member.getDomain());
if ( notify ) {
notify = Arrays.equals(domain, member.getDomain());
if (notify) {
notify = membership.memberAlive(member);
}
}
if ( notify ) {
if (notify) {
super.memberAdded(member);
} else {
if(log.isInfoEnabled()) {
if (log.isInfoEnabled()) {
log.info(sm.getString("domainFilterInterceptor.member.refused", member));
}
}
}

@Override
public void memberDisappeared(Member member) {
if ( membership == null ) {
if (membership == null) {
setupMembership();
}
boolean notify = false;
synchronized (membership) {
notify = Arrays.equals(domain,member.getDomain());
if ( notify ) {
notify = Arrays.equals(domain, member.getDomain());
if (notify) {
membership.removeMember(member);
}
}
if ( notify ) {
if (notify) {
super.memberDisappeared(member);
}
}

@Override
public boolean hasMembers() {
if ( membership == null ) {
if (membership == null) {
setupMembership();
}
return membership.hasMembers();
}

@Override
public Member[] getMembers() {
if ( membership == null ) {
if (membership == null) {
setupMembership();
}
return membership.getMembers();
}

@Override
public Member getMember(Member mbr) {
if ( membership == null ) {
if (membership == null) {
setupMembership();
}
return membership.getMember(mbr);
Expand All @@ -125,7 +124,7 @@ public Member getLocalMember(boolean incAlive) {


protected synchronized void setupMembership() {
if ( membership == null ) {
if (membership == null) {
membership = new Membership(super.getLocalMember(true));
}

Expand All @@ -141,7 +140,7 @@ public void setDomain(byte[] domain) {
}

public void setDomain(String domain) {
if ( domain == null ) {
if (domain == null) {
return;
}
if (domain.startsWith("{")) {
Expand Down
Loading

0 comments on commit b595fdf

Please sign in to comment.