From: fhanik <fhanik@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 10 Aug 2007 19:45:04 +0000 (+0000)
Subject: backport
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=a4074f9910429156b5d36e323bf7f512741024f8;p=tomcat7.0

backport


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@564730 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
index cf4564d1b..2261f7dc6 100644
--- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
@@ -720,7 +720,7 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements
             Map.Entry e = (Map.Entry) i.next();
             MapEntry entry = (MapEntry) super.get(e.getKey());
             if (entry.isPrimary() && inSet(member,entry.getBackupNodes())) {
-                System.out.println("[1] Primary choosing a new backup");
+                if (log.isDebugEnabled()) log.debug("[1] Primary choosing a new backup");
                 try {
                     Member[] backup = publishEntryInfo(entry.getKey(), entry.getValue());
                     entry.setBackupNodes(backup);
@@ -729,7 +729,7 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements
                     log.error("Unable to relocate[" + entry.getKey() + "] to a new backup node", x);
                 }
             } else if (member.equals(entry.getPrimary())) {
-                System.out.println("[2] Primary disappeared");
+                if (log.isDebugEnabled()) log.debug("[2] Primary disappeared");
                 entry.setPrimary(null);
             } //end if
             
@@ -739,7 +739,7 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements
                  entry.getBackupNodes().length == 1 &&
                  entry.getBackupNodes()[0].equals(member) ) {
                 //remove proxies that have no backup nor primaries
-                System.out.println("[3] Removing orphaned proxy");
+                if (log.isDebugEnabled()) log.debug("[3] Removing orphaned proxy");
                 i.remove();
             } else if ( entry.getPrimary() == null &&
                         entry.isBackup() &&
@@ -747,7 +747,7 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements
                         entry.getBackupNodes().length == 1 &&
                         entry.getBackupNodes()[0].equals(channel.getLocalMember(false)) ) {
                 try {
-                    System.out.println("[4] Backup becoming primary");
+                    if (log.isDebugEnabled()) log.debug("[4] Backup becoming primary");
                     entry.setPrimary(channel.getLocalMember(false));
                     entry.setBackup(false);
                     entry.setProxy(false);