Author: fhanik
Date: Thu Aug 30 12:14:43 2007
New Revision: 571276
URL: http://svn.apache.org/viewvc?rev=571276&view=rev
Log:
forward port of bugfixes from 6.0
Modified:
tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java
tomcat/trunk/webapps/docs/config/cluster-manager.xml
tomcat/trunk/webapps/docs/config/cluster.xml
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardManager.java?rev=571276&r1=571275&r2=571276&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardManager.java Thu Aug
30 12:14:43 2007
@@ -395,7 +395,6 @@
session.setManager(this);
sessions.put(session.getIdInternal(), session);
session.activate();
- session.endAccess();
}
} catch (ClassNotFoundException e) {
log.error(sm.getString("standardManager.loading.cnfe", e), e);
Modified: tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java?rev=571276&r1=571275&r2=571276&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java Thu Aug 30
12:14:43 2007
@@ -124,7 +124,7 @@
"org.apache.catalina.deploy.ContextResourceEnvRef"));
digester.addObjectCreate(prefix + "ServiceRef",
- "org.apache.catalina.deploy.Contextservice");
+ "org.apache.catalina.deploy.ContextService");
digester.addRule(prefix + "ServiceRef", new SetAllPropertiesRule());
digester.addRule(prefix + "ServiceRef",
new SetNextNamingRule("addService",
Modified: tomcat/trunk/webapps/docs/config/cluster-manager.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-manager.xml?rev=571276&r1=571275&r2=571276&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/cluster-manager.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster-manager.xml Thu Aug 30 12:14:43
2007
@@ -87,7 +87,7 @@
<attributes>
<attribute name="mapSendOptions" required="false">
The backup manager uses a replicated map, this map is sending and
receiving messages.
- You can setup the flag for how this map is sending messages, the
default value is <code>8</code>(asynchronous).
+ You can setup the flag for how this map is sending messages, the
default value is <code>6</code>(asynchronous).
</attribute>
<attribute name="stateTransferTimeout" required="false">
The timeout in seconds for doing a state transfer of all sessions when
a node is started up.
Modified: tomcat/trunk/webapps/docs/config/cluster.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster.xml?rev=571276&r1=571275&r2=571276&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/cluster.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster.xml Thu Aug 30 12:14:43 2007
@@ -92,7 +92,7 @@
</p>
</attribute>
<attribute name="channelSendOptions" required="true">
- <p>The Tribes channel send options, default is 11.<br/>
+ <p>The Tribes channel send options, default is <code>8</code>.<br/>
This option is used to set the flag that all messages sent through
the
SimpleTcpCluster uses. The flag decides how the messages are sent,
and is a simple logical OR.<br/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
