svn commit: r673925 - in /tomcat/connectors/trunk/jni/xdocs: index.xml news/2008.xml
Author: jfclere Date: Fri Jul 4 00:02:12 2008 New Revision: 673925 URL: http://svn.apache.org/viewvc?rev=673925&view=rev Log: Arrange doc for release. Modified: tomcat/connectors/trunk/jni/xdocs/index.xml tomcat/connectors/trunk/jni/xdocs/news/2008.xml Modified: tomcat/connectors/trunk/jni/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/xdocs/index.xml?rev=673925&r1=673924&r2=673925&view=diff == --- tomcat/connectors/trunk/jni/xdocs/index.xml (original) +++ tomcat/connectors/trunk/jni/xdocs/index.xml Fri Jul 4 00:02:12 2008 @@ -44,6 +44,18 @@ + +04 July 2008 - TC-Native-1.1.14 released +The Apache Tomcat team is proud to announce the immediate availability +of Tomcat Native 1.1.14 Stable. + +Download the http://www.apache.org/dist/tomcat/tomcat-connectors/native/tomcat-native-1.1.14-src.tar.gz";>TC-native 1.1.14 release sources + | http://www.apache.org/dist/tomcat/tomcat-connectors/native/tomcat-native-1.1.14-src.tar.gz.asc";>PGP signature + +Download the http://tomcat.heanet.ie/native/";>binaries for selected platforms. + + + 15 February 2008 - TC-Native-1.1.13 released The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 1.1.13 Stable. Modified: tomcat/connectors/trunk/jni/xdocs/news/2008.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/xdocs/news/2008.xml?rev=673925&r1=673924&r2=673925&view=diff == --- tomcat/connectors/trunk/jni/xdocs/news/2008.xml (original) +++ tomcat/connectors/trunk/jni/xdocs/news/2008.xml Fri Jul 4 00:02:12 2008 @@ -31,6 +31,13 @@ + +4 July - TC-Native-1.1.14 released + +The Apache Tomcat team is proud to announce the immediate availability +of Tomcat Native 1.1.14. This is a stable release adding some bug fixes. + + 15 February - TC-Native-1.1.13 released - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r673933 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/core/StandardWrapper.java
Author: markt
Date: Fri Jul 4 00:25:22 2008
New Revision: 673933
URL: http://svn.apache.org/viewvc?rev=673933&view=rev
Log:
Another fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=43683
This isn't perfect but it narrows the window for the race condition
significantly. A perfect fix would require syncing most (all?) of allocate()
which is on the critical path.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=673933&r1=673932&r2=673933&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jul 4 00:25:22 2008
@@ -38,14 +38,6 @@
+1: markt, fhanik
-1:
-* Another fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=43683
- This isn't perfect but it narrows the window for the race condition
- significantly. A perfect fix would require syncing most (all?) of allocate()
- which is on the critical path.
- http://svn.apache.org/viewvc?rev=672397&view=rev
- +1: markt, fhanik, remm
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=36155
Port the fix from the JK Connector to the AJP and APR Connectors
http://svn.apache.org/viewvc?rev=672454&view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=673933&r1=673932&r2=673933&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java Fri
Jul 4 00:25:22 2008
@@ -792,6 +792,8 @@
throw new ServletException
(sm.getString("standardWrapper.unloading", getName()));
+boolean newInstance = false;
+
// If not SingleThreadedModel, return the same instance every time
if (!singleThreadModel) {
@@ -804,6 +806,12 @@
log.debug("Allocating non-STM instance");
instance = loadServlet();
+// For non-STM, increment here to prevent a race
+// condition with unload. Bug 43683, test case #3
+if (!singleThreadModel) {
+newInstance = true;
+countAllocated++;
+}
} catch (ServletException e) {
throw e;
} catch (Throwable e) {
@@ -817,10 +825,13 @@
if (!singleThreadModel) {
if (log.isTraceEnabled())
log.trace(" Returning non-STM instance");
-countAllocated++;
+// For new instances, count will have been incremented at the
+// time of creation
+if (!newInstance) {
+countAllocated++;
+}
return (instance);
}
-
}
synchronized (instancePool) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43683] Accessing Servlet while Reloading context gives 404 error
https://issues.apache.org/bugzilla/show_bug.cgi?id=43683 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #23 from Mark Thomas <[EMAIL PROTECTED]> 2008-07-04 00:28:31 PST --- The patch for test case #3 has been applied to trunk. Whilst the fix isn't perfect is should be extremely difficult (verging on impossible) to reproduce this issue under normal usage. If you have a test case that still demonstrates this issue with the latest patches, please feel free to re-open this bug. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r673937 - in /tomcat/site/trunk: docs/download-native.html xdocs/download-native.xml
Author: jfclere Date: Fri Jul 4 00:30:44 2008 New Revision: 673937 URL: http://svn.apache.org/viewvc?rev=673937&view=rev Log: Release 1.1.14 Modified: tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/xdocs/download-native.xml Modified: tomcat/site/trunk/docs/download-native.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=673937&r1=673936&r2=673937&view=diff == --- tomcat/site/trunk/docs/download-native.html (original) +++ tomcat/site/trunk/docs/download-native.html Fri Jul 4 00:30:44 2008 @@ -1,425 +1,425 @@ - -http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> - - -Apache Tomcat - Tomcat Native Downloads - - - - - - - - - -http://tomcat.apache.org/";> - - - - - -Apache Tomcat - - - - -http://www.apache.org/";> -http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"/> - - - - - -http://www.google.com/search"; method="get"> - - - - - - - - - - - - - - - - -Apache Tomcat - - - -Home - - - -Download - - - -Which version? - - -Tomcat 6.x - - -Tomcat 5.5 - - -Tomcat 4.1 - - -Tomcat Connectors - - -Tomcat Native - - -http://archive.apache.org/dist/tomcat";>Archives - - - -Documentation - - - -Tomcat 6.0 - - -Tomcat 5.5 - - -Tomcat 4.1 - - -Tomcat Connectors - - -Tomcat Native - - -Migration Guide - - - -Problems? - - - -Security Reports - - -Find help - - -FAQ - - -Mailing Lists - - -Bug Database - - -IRC - - - -Get Involved - - - -Overview - - -SVN Repositories - - -Mailing Lists - - -http://wiki.apache.org/tomcat";>Wiki - - - -Misc - - - -Who We Are - - -Heritage - - -http://www.apache.org";>Apache Home - - -Resources - - -Contact - - -Legal - - -http://www.apache.org/foundation/sponsorship.html";>Sponsorship - - -http://www.apache.org/foundation/thanks.html";>Thanks - - - - - - - - - - -Tomcat Native Downloads - - - - - - - - - - Use the links below to download Tomcat Native from one of - our mirrors. You must verify the - integrity of the downloaded files using signatures downloaded from - our main distribution directory. - - Only current recommended releases are available on the main - distribution site and its mirrors. Older releases are available from the - http://archive.apache.org/dist/tomcat/tomcat-connectors/";> - archive download site. - - Recent releases (48 hours) may not yet be available from the mirrors. - - - - - - -Choose a Mirror - - - - - - - -You are currently using [preferred]. If you -encounter a problem with this mirror, please select another -mirror. If all mirrors are failing, there are backup -mirrors (at the end of the mirrors list) that should be -available. -[if-any logo] - - - -[end] - - - -Other mirrors: -[if-any http] - [for http][http][end] -[end] -[if-any ftp] - [for ftp][ftp][end] -[end] -[if-any backup] - [for backup][backup] (backup)[end] -[end] - - - - -You may also consult the http://www.apache.org/mirrors/";>complete -list of mirrors. - - - - - - - - - - - - - - - -Tomcat Native Connector - - - - - - - -For more information concerning Tomcat Native, see the -http://tomcat.apache.org/native-doc/"; class="name">Tomcat Native site. - - - -Source (please choose the correct format for your platform) - - - - -Native 1.1.13 Source Release tar.gz - (e.g. Unix, Linux, Mac OS) - - - -[http://www.apache.org/dist/tomcat/tomcat-connectors/native/tomcat-native-1.1.13-src.tar.gz.asc";>PGP] - - - - -[http://www.apache.org/dist/tomcat/tomcat-connectors/native/tomcat-native-1.1.13-src.tar.gz.md5";>MD5] - - - - - - -Native 1.1.13 Source Release zip - (e.g. Windows) - - - -[http://www.apache.org/dist/tomcat/tomcat-connectors/native/tomcat-native-1.1.13-win32-src.zip.asc";>PGP] - - - - -[http://www.apache.org/dist/tomcat/tomcat-connectors/native/tomcat-native-1.1.13-win32-src.zip.md5";>MD5] - - - - - - - -Due to crypto retriction the binaries release are not yet available on the ASF site -You may download them from http://tomcat.heanet.ie/native/";>HERE - - - - - - - - - - - - - - - - - -Verify the Integrity of the Files - - - - - - - - -It is essential that you verify the integrity of the downloaded -files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. -
svn commit: r673938 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Fri Jul 4 00:31:09 2008 New Revision: 673938 URL: http://svn.apache.org/viewvc?rev=673938&view=rev Log: Vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=673938&r1=673937&r2=673938&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jul 4 00:31:09 2008 @@ -52,5 +52,5 @@ * Fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=45317 http://svn.apache.org/viewvc?rev=673487&view=rev Properly document and print out the value of the state transfer timeout setting - +1: fhanik + +1: fhanik, markt -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r673614 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.properties.default build.xml dist.xml webapps/docs/changelog.xml
On Thu, 2008-07-03 at 21:57 -0400, Filip Hanik - Dev Lists wrote: > I think this one is missing It's possible, I did not try. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r673942 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: remm Date: Fri Jul 4 00:47:01 2008 New Revision: 673942 URL: http://svn.apache.org/viewvc?rev=673942&view=rev Log: - Add patch for osfamily. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=673942&r1=673941&r2=673942&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jul 4 00:47:01 2008 @@ -54,3 +54,21 @@ Properly document and print out the value of the state transfer timeout setting +1: fhanik, markt -1: + +* Supposedly Windows should be used with osfamily too. +Index: dist.xml +=== +--- dist.xml (revision 673938) dist.xml (working copy) +@@ -454,7 +454,7 @@ + + + +- ++ + + + + + +1: remm + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r673943 - /tomcat/trunk/webapps/docs/ssl-howto.xml
Author: markt Date: Fri Jul 4 00:52:17 2008 New Revision: 673943 URL: http://svn.apache.org/viewvc?rev=673943&view=rev Log: Fix 45310, 45308 and a couple of additional typos. Also use OpenSSL consistently and fix a very long line. Modified: tomcat/trunk/webapps/docs/ssl-howto.xml Modified: tomcat/trunk/webapps/docs/ssl-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/ssl-howto.xml?rev=673943&r1=673942&r2=673943&view=diff == --- tomcat/trunk/webapps/docs/ssl-howto.xml (original) +++ tomcat/trunk/webapps/docs/ssl-howto.xml Fri Jul 4 00:52:17 2008 @@ -198,16 +198,18 @@ Each entry in a keystore is identified by an alias string. Whilst many -keystore implementations treat alaises in a case insensitive manner, case +keystore implementations treat aliases in a case insensitive manner, case sensitive implementations are available. The PKCS11 specification, for example, requires that aliases are case sensitive. To avoid issues related -to the case sensitivity of aliaises, it is not recommended to use aliases that +to the case sensitivity of aliases, it is not recommended to use aliases that differ only in case. To import an existing certificate into a JKS keystore, please read the documentation (in your JDK documentation package) about keytool. -Note that openssl often adds a readable comments before the key, keytooldoes not support that, so remove the openssl comments if they exist before importing the key using keytool. +Note that OpenSSL often adds a readable comments before the key, +keytooldoes not support that, so remove the OpenSSL comments if +they exist before importing the key using keytool. To import an existing certificate signed by your own CA into a PKCS12 keystore using OpenSSL you would execute a command like: @@ -216,7 +218,7 @@ -caname root -chain For more advanced cases, consult the http://www.openssl.org/";>OpenSSL -documententation. +documentation. To create a new keystore from scratch, containing a single self-signed Certificate, execute the following from a terminal command line: @@ -280,7 +282,7 @@ -If you are using APR, you have the option of configuring an alternative engine to openSSL. +If you are using APR, you have the option of configuring an alternative engine to OpenSSL.@@ -450,7 +452,7 @@ keystoreType Add this element if using a keystore type other than JKS. -For example the *.p12 files from openssl can be used using PKCS12. +For example the *.p12 files from OpenSSL can be used using PKCS12. sslProtocol - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45308] alaises >> aliases
https://issues.apache.org/bugzilla/show_bug.cgi?id=45308 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas <[EMAIL PROTECTED]> 2008-07-04 00:56:25 PST --- This has been fixed in trunk and 6.0.x and will be in 6.0.17 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r673948 - /tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml
Author: markt Date: Fri Jul 4 00:56:04 2008 New Revision: 673948 URL: http://svn.apache.org/viewvc?rev=673948&view=rev Log: Port documentation fixes Modified: tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml?rev=673948&r1=673947&r2=673948&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml Fri Jul 4 00:56:04 2008 @@ -201,13 +201,15 @@ keystore implementations treat aliases in a case insensitive manner, case sensitive implementations are available. The PKCS11 specification, for example, requires that aliases are case sensitive. To avoid issues related -to the case sensitivity of aliaises, it is not recommended to use aliases that +to the case sensitivity of aliases, it is not recommended to use aliases that differ only in case. To import an existing certificate into a JKS keystore, please read the documentation (in your JDK documentation package) about keytool. -Note that openssl often adds a readable comments before the key, keytooldoes not support that, so remove the openssl comments if they exist before importing the key using keytool. +Note that OpenSSL often adds a readable comments before the key, +keytooldoes not support that, so remove the OpenSSL comments if +they exist before importing the key using keytool. To import an existing certificate signed by your own CA into a PKCS12 keystore using OpenSSL you would execute a command like: @@ -216,7 +218,7 @@ -caname root -chain For more advanced cases, consult the http://www.openssl.org/";>OpenSSL -documententation. +documentation. To create a new keystore from scratch, containing a single self-signed Certificate, execute the following from a terminal command line: @@ -280,7 +282,7 @@ -If you are using APR, you have the option of configuring an alternative engine to openSSL. +If you are using APR, you have the option of configuring an alternative engine to OpenSSL.@@ -449,9 +451,8 @@ keystoreType -Add this element if using a keystore type other than -JKS. For example the *.p12 files from openssl can be -used using PKCS12 +Add this element if using a keystore type other than JKS. +For example the *.p12 files from OpenSSL can be used using PKCS12. sslProtocol - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45310] aliaises >> aliases
https://issues.apache.org/bugzilla/show_bug.cgi?id=45310 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas <[EMAIL PROTECTED]> 2008-07-04 00:56:59 PST --- This has been fixed in trunk and 6.0.x and will be in 6.0.17 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[ANN] Apache Tomcat Native 1.1.14 released
The Apache Tomcat team announces the immediate availability of Apache Tomcat Native 1.1.14 stable. This release includes few bug fixes over Apache Tomcat Native 1.1.13. Please refer to the change log for the list of changes: http://tomcat.apache.org/native-doc/miscellaneous/changelog.html Downloads: http://tomcat.apache.org/download-native.cgi Thank you, -- The Apache Tomcat Team - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r674029 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: jfclere Date: Fri Jul 4 05:23:01 2008 New Revision: 674029 URL: http://svn.apache.org/viewvc?rev=674029&view=rev Log: my votes. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=674029&r1=674028&r2=674029&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jul 4 05:23:01 2008 @@ -35,7 +35,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45212 Map.entrySet() should return entries, not values http://svn.apache.org/viewvc?rev=668849&view=rev - +1: markt, fhanik + +1: markt, fhanik, jfclere -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=36155 @@ -70,5 +70,5 @@ - +1: remm + +1: remm, jfclere -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r674051 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java webapps/docs/changelog.xml
Author: markt
Date: Fri Jul 4 06:31:45 2008
New Revision: 674051
URL: http://svn.apache.org/viewvc?rev=674051&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45212
Map.entrySet() should return entries, not values
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=674051&r1=674050&r2=674051&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jul 4 06:31:45 2008
@@ -31,13 +31,6 @@
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45212
- Map.entrySet() should return entries, not values
- http://svn.apache.org/viewvc?rev=668849&view=rev
- +1: markt, fhanik, jfclere
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=36155
Port the fix from the JK Connector to the AJP and APR Connectors
http://svn.apache.org/viewvc?rev=672454&view=rev
@@ -70,5 +63,5 @@
- +1: remm, jfclere
+ +1: remm, jfclere, markt
-1:
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=674051&r1=674050&r2=674051&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Fri Jul 4 06:31:45 2008
@@ -1017,7 +1017,9 @@
Map.Entry e = (Map.Entry)i.next();
Object key = e.getKey();
MapEntry entry = (MapEntry)super.get(key);
-if ( entry != null && entry.isPrimary() )
set.add(entry.getValue());
+if ( entry != null && entry.isPrimary() ) {
+set.add(new MapEntry(key, entry.getValue()));
+}
}
return Collections.unmodifiableSet(set);
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=674051&r1=674050&r2=674051&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Jul 4 06:31:45 2008
@@ -389,6 +389,10 @@
+
+45212: AbstractReplicatedMap.entrySet() now returns entries
+rather than vaules. (markt)
+
45279Properly close multicast socket.
Fix session replication dead lock during non sticky load balancing.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45212] AbstractReplicatedMap. entrySet returns values not entries.
https://issues.apache.org/bugzilla/show_bug.cgi?id=45212 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas <[EMAIL PROTECTED]> 2008-07-04 06:32:39 PST --- This has been fixed in 6.0.x and will be included in 6.0.17 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45337] The tomcat dosen't know which file is new or old
https://issues.apache.org/bugzilla/show_bug.cgi?id=45337 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Mark Thomas <[EMAIL PROTECTED]> 2008-07-04 09:34:49 PST --- Please take a look at org.apache.jasper.compiler.Compiler line 350 onwards. The only criteria used to determine if a file is old is timestamp. If you are having problems with JSPs not re-compiling, please use the [EMAIL PROTECTED] mailing list to help you. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r674089 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: yoavs Date: Fri Jul 4 09:54:17 2008 New Revision: 674089 URL: http://svn.apache.org/viewvc?rev=674089&view=rev Log: approve patch for Bugzilla 36155. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=674089&r1=674088&r2=674089&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jul 4 09:54:17 2008 @@ -45,7 +45,7 @@ * Fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=45317 http://svn.apache.org/viewvc?rev=673487&view=rev Properly document and print out the value of the state transfer timeout setting - +1: fhanik, markt + +1: fhanik, markt, yoavs -1: * Supposedly Windows should be used with osfamily too. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r674109 - in /tomcat/tc6.0.x/trunk: STATUS.txt dist.xml
Author: remm Date: Fri Jul 4 12:45:12 2008 New Revision: 674109 URL: http://svn.apache.org/viewvc?rev=674109&view=rev Log: - Use osfamily. Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/dist.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=674109&r1=674108&r2=674109&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jul 4 12:45:12 2008 @@ -47,21 +47,3 @@ Properly document and print out the value of the state transfer timeout setting +1: fhanik, markt, yoavs -1: - -* Supposedly Windows should be used with osfamily too. -Index: dist.xml -=== dist.xml (revision 673938) -+++ dist.xml (working copy) -@@ -454,7 +454,7 @@ - - - -- -+ - - - - - +1: remm, jfclere, markt - -1: Modified: tomcat/tc6.0.x/trunk/dist.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=674109&r1=674108&r2=674109&view=diff == --- tomcat/tc6.0.x/trunk/dist.xml (original) +++ tomcat/tc6.0.x/trunk/dist.xml Fri Jul 4 12:45:12 2008 @@ -454,7 +454,7 @@ - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43327] Socket bind fails on tomcat startup when using apr
https://issues.apache.org/bugzilla/show_bug.cgi?id=43327 --- Comment #14 from Mark Thomas <[EMAIL PROTECTED]> 2008-07-04 14:06:16 PST --- Bingo! I can now reproduce this. Hopefully a fix won't be too far away... -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r674125 - in /tomcat/trunk: java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java webapps/docs/config/cluster-membership.xml webapps/docs/config/cluster-sender.xml webapps/docs/config/clus
Author: fhanik
Date: Fri Jul 4 14:30:31 2008
New Revision: 674125
URL: http://svn.apache.org/viewvc?rev=674125&view=rev
Log:
Add in startup options to the cluster channel.
Document the multicast recovery options
Modified:
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/trunk/webapps/docs/config/cluster-membership.xml
tomcat/trunk/webapps/docs/config/cluster-sender.xml
tomcat/trunk/webapps/docs/config/cluster.xml
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=674125&r1=674124&r2=674125&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Fri Jul
4 14:30:31 2008
@@ -179,6 +179,8 @@
private Map properties = new HashMap();
private int channelSendOptions = Channel.SEND_OPTIONS_ASYNCHRONOUS;
+
+private int channelStartOptions = Channel.DEFAULT;
// - Properties
@@ -673,7 +675,7 @@
registerClusterValve();
channel.addMembershipListener(this);
channel.addChannelListener(this);
-channel.start(channel.DEFAULT);
+channel.start(channelStartOptions);
if (clusterDeployer != null) clusterDeployer.start();
this.started = true;
//register JMX objects
@@ -769,7 +771,7 @@
this.managers.clear();
try {
if ( clusterDeployer != null ) clusterDeployer.setCluster(null);
-channel.stop(Channel.DEFAULT);
+channel.stop(channelStartOptions);
channel.removeChannelListener(this);
channel.removeMembershipListener(this);
this.unregisterClusterValve();
@@ -951,4 +953,12 @@
public String getProtocol() {
return null;
}
+
+public int getChannelStartOptions() {
+return channelStartOptions;
+}
+
+public void setChannelStartOptions(int channelStartOptions) {
+this.channelStartOptions = channelStartOptions;
+}
}
Modified: tomcat/trunk/webapps/docs/config/cluster-membership.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-membership.xml?rev=674125&r1=674124&r2=674125&view=diff
==
--- tomcat/trunk/webapps/docs/config/cluster-membership.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster-membership.xml Fri Jul 4 14:30:31
2008
@@ -125,6 +125,28 @@
If a value smaller or equal to 0 is presented, the code will default
this value to frequency
+
+
+ In case of a network failure, Java multicast socket don't transparently
fail over, instead the socket will continously
+ throw IOException upon each receive request. When recoveryEnabled is set
to true, this will close the multicast socket
+ and open a new socket with the same properties as defined above.
+ The default is true.
+
+
+
+
+ When recoveryEnabled==true this value indicates how many
times we will try recovery.
+ The default is 10.
+
+
+
+
+ When recoveryEnabled==true this value indicates how long
time (in milliseconds)
+ the system will sleep in between recovery attempts, until we either
recovered successfully or we have reached the
+ recoveryCounter limit.
+ The default is 5000 (5 seconds).
+
+
Modified: tomcat/trunk/webapps/docs/config/cluster-sender.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-sender.xml?rev=674125&r1=674124&r2=674125&view=diff
==
--- tomcat/trunk/webapps/docs/config/cluster-sender.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster-sender.xml Fri Jul 4 14:30:31 2008
@@ -98,10 +98,10 @@
The send buffer size on the datagram socket.
Default value is 43800 bytes.
-
+
Possible values are true or false.
- Set to true if you want the receiver to use direct bytebuffers when
reading data
- from the sockets. Default value is false
+ Set to true if you want the receiver to use direct bytebuffers when
writing data
+ to the sockets. Default value is false
The number of requests that can go through the socket before the socket
is closed, and reopened
@@ -113,7 +113,10 @@
Sets the SO_TIMEOUT option on the socket. The value is in milliseconds
and the default value is 3000
-milliseconds.
+milliseconds.(3 seconds) This timeout starts when a message send
attempt is starting, until
svn commit: r674126 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: fhanik Date: Fri Jul 4 14:32:27 2008 New Revision: 674126 URL: http://svn.apache.org/viewvc?rev=674126&view=rev Log: proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=674126&r1=674125&r2=674126&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jul 4 14:32:27 2008 @@ -47,3 +47,9 @@ Properly document and print out the value of the state transfer timeout setting +1: fhanik, markt, yoavs -1: + +* Add in startup options, so that cluster can be started in TCP mode only, when using static membership + Also document the multicast recovery options + http://svn.apache.org/viewvc?rev=674125&view=rev + +1: fhanik + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
