Fix a couple of clustering issues:

 - Don't try and obtain session data from the cluster if the current node is the only node in the cluster.
 - Log requesting session data as INFO rather than WARNING.

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

diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java b/java/org/apache/catalina/ha/session/DeltaManager.java
index de987a3..ce738e4 100644 (file)
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -802,7 +802,7 @@ public CatalinaCluster getCluster() {
      * @see #findSessionMasterMember()
      */
     public synchronized void getAllClusterSessions() {
-        if (cluster != null && cluster.getMembers().length > 0) {
+        if (cluster != null && cluster.getMembers().length > 1) {
             long beforeSendTime = System.currentTimeMillis();
             Member mbr = findSessionMasterMember();
             if(mbr == null) { // No domain member found
@@ -820,8 +820,8 @@ public CatalinaCluster getCluster() {
                      receiverQueue = true ;
                 }
                 cluster.send(msg, mbr);
-                if (log.isWarnEnabled())
-                    log.warn(sm.getString("deltaManager.waitForSessionState",getName(), mbr, Integer.valueOf(getStateTransferTimeout())));
+                if (log.isInfoEnabled())
+                    log.info(sm.getString("deltaManager.waitForSessionState",getName(), mbr, Integer.valueOf(getStateTransferTimeout())));
                 // FIXME At sender ack mode this method check only the state transfer and resend is a problem!
                 waitForSendAllSessions(beforeSendTime);
             } finally {

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 954e0f8..0edd3d3 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -70,6 +70,11 @@
         <bug>50185</bug>: Add additional trace level logging to Tribes to assist
         with fault diagnosis. Based on a patch by Ariel. (markt)
       </add>
+      <fix>
+        Don&apos;t try and obtain session data from the cluster if the current
+        node is the only node in the cluster. Log requesting session data as
+        INFO rather than WARNING. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Web applications">