svn commit: r1061363 - /tomcat/tc6.0.x/trunk/STATUS.txt

[markt]

Author: markt
Date: Thu Jan 20 16:07:25 2011
New Revision: 1061363

URL: http://svn.apache.org/viewvc?rev=1061363view=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=1061363r1=1061362r2=1061363view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 20 16:07:25 2011
@@ -145,3 +145,8 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=1056889view=rev
   +1: kkolinko, markt, kfujino
   -1:
+
+* Fix very large memory leak in NIO connector
+  http://svn.apache.org/viewvc?view=revisionrevision=1050249
+  +1: markt
+  -1:



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Need a 6.0.31 release

[Mark Thomas]

The memory leak in the Tomcat 7 NIO connector [1] got back-ported to
6.0.x and included in 6.0.30. [2]

I have proposed the fix for 6.0.x. Given the severity I think we need to
approve the backport and start a 6.0.31 release asap.

Mark


[1] http://svn.apache.org/viewvc?view=revisionrevision=1050249
[2] http://svn.apache.org/viewvc?view=revisionrevision=1033341

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Need a 6.0.31 release

[Filip Hanik - Dev Lists]

+1


On 1/20/2011 9:09 AM, Mark Thomas wrote:

The memory leak in the Tomcat 7 NIO connector [1] got back-ported to
6.0.x and included in 6.0.30. [2]

I have proposed the fix for 6.0.x. Given the severity I think we need to
approve the backport and start a 6.0.31 release asap.

Mark


[1] http://svn.apache.org/viewvc?view=revisionrevision=1050249
[2] http://svn.apache.org/viewvc?view=revisionrevision=1033341

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



-
No virus found in this message.
Checked by AVG - www.avg.com
Version: 10.0.1191 / Virus Database: 1435/3391 - Release Date: 01/19/11





-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061376 - in /tomcat/trunk: java/org/apache/catalina/core/ java/org/apache/catalina/startup/ java/org/apache/naming/resources/ test/org/apache/catalina/core/ test/webapp-3.0-fragments/WEB

[markt]

Author: markt
Date: Thu Jan 20 16:35:55 2011
New Revision: 1061376

URL: http://svn.apache.org/viewvc?rev=1061376view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50535
Provid an option (disabled by default) to serve resources from 
/WEB-INF/classes/META-INF/resources

Added:
tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/classes/META-INF/
tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/classes/META-INF/resources/

tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/classes/META-INF/resources/resourceG.jsp
   (with props)
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
tomcat/trunk/webapps/docs/config/context.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1061376r1=1061375r2=1061376view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Thu Jan 20 
16:35:55 2011
@@ -817,9 +817,22 @@ public class StandardContext extends Con
 
 private String webappVersion = ;
 
+private boolean addWebinfClassesResources = false;
+
 // - Context Properties
 
 
+public void setAddWebinfClassesResources(
+boolean addWebinfClassesResources) {
+this.addWebinfClassesResources = addWebinfClassesResources;
+}
+
+
+public boolean getAddWebinfClassesResources() {
+return addWebinfClassesResources;
+}
+
+
 @Override
 public void setWebappVersion(String webappVersion) {
 if (null == webappVersion) {
@@ -4640,6 +4653,20 @@ public class StandardContext extends Con
 ((BaseDirContext) webappResources).allocate();
 // Alias support
 ((BaseDirContext) webappResources).setAliases(getAliases());
+
+if (effectiveMajorVersion =3  addWebinfClassesResources) {
+try {
+DirContext webInfCtx =
+(DirContext) webappResources.lookup(
+/WEB-INF/classes);
+// Do the lookup to make sure it exists
+webInfCtx.lookup(META-INF/resources);
+((BaseDirContext) webappResources).addAltDirContext(
+webInfCtx);
+} catch (NamingException e) {
+// Doesn't exist - ignore and carry on
+}
+}
 }
 // Register the cache in JMX
 if (isCachingAllowed()) {

Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1061376r1=1061375r2=1061376view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Thu Jan 20 
16:35:55 2011
@@ -1294,6 +1294,8 @@ public class ContextConfig
 }
 }
 processResourceJARs(resourceJars);
+// See also StandardContext.resourcesStart() for
+// WEB-INF/classes/META-INF/resources configuration
 }
 
 // Only look for ServletContainerInitializer if metadata is not

Modified: tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java?rev=1061376r1=1061375r2=1061376view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java Thu Jan 
20 16:35:55 2011
@@ -167,7 +167,15 @@ public abstract class BaseDirContext imp
 }
 }
 
-
+
+/**
+ * Add an alternative DirContext (must contain META-INF/resources) 
directly.
+ */
+public void addAltDirContext(DirContext altDirContext) {
+altDirContexts.add(altDirContext);
+}
+
+
 /**
  * Add an alias.
  */

Modified: 
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java?rev=1061376r1=1061375r2=1061376view=diff

svn commit: r1061377 - /tomcat/tc6.0.x/trunk/STATUS.txt

[jfclere]

Author: jfclere
Date: Thu Jan 20 16:36:21 2011
New Revision: 1061377

URL: http://svn.apache.org/viewvc?rev=1061377view=rev
Log:
My 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=1061377r1=1061376r2=1061377view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 20 16:36:21 2011
@@ -148,5 +148,5 @@ PATCHES PROPOSED TO BACKPORT:
 
 * Fix very large memory leak in NIO connector
   http://svn.apache.org/viewvc?view=revisionrevision=1050249
-  +1: markt
+  +1: markt, jfclere
   -1:



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Need a 6.0.31 release

[jean-frederic clere]

On 01/20/2011 05:09 PM, Mark Thomas wrote:

The memory leak in the Tomcat 7 NIO connector [1] got back-ported to
6.0.x and included in 6.0.30. [2]

I have proposed the fix for 6.0.x. Given the severity I think we need to
approve the backport and start a 6.0.31 release asap.


+1

Cheers

Jean-Frederic

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 50535] Support resources serving from /WEB-INF/classes/META-INF/resources directory

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=50535

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mark Thomas ma...@apache.org 2011-01-20 11:39:49 EST ---
Application server specific extensions to the Servlet specification are a
really bad idea since they harm portability - the reason why we have a
specification in the first place. On that basis I almost closed this one as
WONTFIX.

However, I do see a valid use case and one that I suspect will lead to a change
in the spec. Some environments, particularly IDEs, unpack all their JARs into
the WEB-INF/classes directory. This would break static resources in JARs.
Enabling this option works around this issue.

Since this is a proprietary extension, it is disabled by default and controlled
by an attribute on the StandardContext but is not part of the Context
interface.

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061393 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/naming/resources/ProxyDirContext.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Jan 20 17:03:13 2011
New Revision: 1061393

URL: http://svn.apache.org/viewvc?rev=1061393view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50550
Requests for a newly created directory using MKCOL should not result in a 404

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/ProxyDirContext.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 20 17:03:13 2011
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77
 
0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901
 
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686
 
,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1055055,1055236,1055458,1056264,1059881

DO NOT REPLY [Bug 50550] PropFind 404 error after MkCol succes

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=50550

--- Comment #2 from Mark Thomas ma...@apache.org 2011-01-20 12:03:35 EST ---
Fixed in 6.0.x and will be included in 6.0.31 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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061395 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/servlets/DefaultServlet.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Jan 20 17:08:54 2011
New Revision: 1061395

URL: http://svn.apache.org/viewvc?rev=1061395view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50413#c6
Serve the error page regardless of Range header in the original request. 
(kkolinko)

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 20 17:08:54 2011
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77
 
0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901
 
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686
 
,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1055055,1055236,1055458,1055975,1056264,1059881

DO NOT REPLY [Bug 50413] Tomcat returns 304 instead of 404 response for static custom 404 error file

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=50413

--- Comment #8 from Mark Thomas ma...@apache.org 2011-01-20 12:09:12 EST ---
fixed in 6.0.x and will be in 6.0.31 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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061397 - /tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java

[kkolinko]

Author: kkolinko
Date: Thu Jan 20 17:09:26 2011
New Revision: 1061397

URL: http://svn.apache.org/viewvc?rev=1061397view=rev
Log:
Use the new release(s,p) method introduced in r1050249

Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1061397r1=1061396r2=1061397view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Thu Jan 
20 17:09:26 2011
@@ -402,9 +402,7 @@ public class Http11NioProtocol extends A
 // less-than-verbose logs.
 log.error(sm.getString(http11protocol.proto.error), e);
 }
-connections.remove(socket);
-processor.recycle();
-recycledProcessors.offer(processor);
+release(socket, processor);
 return SocketState.CLOSED;
 }
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061398 - /tomcat/tc6.0.x/trunk/STATUS.txt

[kkolinko]

Author: kkolinko
Date: Thu Jan 20 17:10:59 2011
New Revision: 1061398

URL: http://svn.apache.org/viewvc?rev=1061398view=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=1061398r1=1061397r2=1061398view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 20 17:10:59 2011
@@ -131,5 +131,10 @@ PATCHES PROPOSED TO BACKPORT:
 
 * Fix very large memory leak in NIO connector
   http://svn.apache.org/viewvc?view=revisionrevision=1050249
-  +1: markt, jfclere
+  +1: markt, jfclere, kkolinko
+  -1:
+
+  Additional patch (not important):
+  http://svn.apache.org/viewvc?rev=1061397view=rev
+  +1: kkolinko
   -1:



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061400 - in /tomcat/tc5.5.x/trunk: STATUS.txt connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java container/webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Jan 20 17:14:00 2011
New Revision: 1061400

URL: http://svn.apache.org/viewvc?rev=1061400view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47319
Return IP address rather than null for getRemoteHost() and the APR connector

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt

tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1061400r1=1061399r2=1061400view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Jan 20 17:14:00 2011
@@ -98,13 +98,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko, markt
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47319
-  Return IP address rather than null for getRemoteHost() and the APR connector
-  http://svn.apache.org/viewvc?view=revisionrevision=1056414
-  (markt's patch)
-  +1: kkolinko, rjung, markt
-  -1:
-
 * Additional patch for bug 50413:
   Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50413#c6
   Serve the error page regardless of Range header in the original request.

Modified: 
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1061400r1=1061399r2=1061400view=diff
==
--- 
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
 Thu Jan 20 17:14:00 2011
@@ -1046,6 +1046,9 @@ public class Http11AprProcessor implemen
 try {
 long sa = Address.get(Socket.APR_REMOTE, socket);
 remoteHost = Address.getnameinfo(sa, 0);
+if (remoteHost == null) {
+remoteHost = Address.getip(sa);
+}
 } catch (Exception e) {
 log.warn(sm.getString(http11processor.socket.info), e);
 }

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1061400r1=1061399r2=1061400view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Thu Jan 20 
17:14:00 2011
@@ -76,6 +76,11 @@
   subsection name=Coyote
 changelog
   fix
+bug47913/bug: Return the IP address rather than null for
+codegetRemoteHost()/code with the APR connector if the IP address
+does not resolve. (markt)
+  /fix
+  fix
 bug49521/bug: Disable scanning for a free port in Jk AJP/1.3
 connector by default. Do not change maxPort field value of 
ChannelSocket
 in its codesetPort()/code and codeinit()/code methods. Add



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 47319] With APR, getRemoteHost() returns NULL for unknown clients

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=47319

--- Comment #5 from Mark Thomas ma...@apache.org 2011-01-20 12:14:11 EST ---
Fixed in 5.5.x and will be in 5.5.32 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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061401 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java

[markt]

Author: markt
Date: Thu Jan 20 17:16:52 2011
New Revision: 1061401

URL: http://svn.apache.org/viewvc?rev=1061401view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50550
Requests for a newly created directory using MKCOL should not result in a 404

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1061401r1=1061400r2=1061401view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Jan 20 17:16:52 2011
@@ -85,14 +85,7 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kfujino, markt
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50550
-  Requests for a newly created directory using MKCOL should not result in a 404
-  http://svn.apache.org/viewvc?rev=1055975view=rev
-  +1: markt
-  +1: kkolinko: Filip's question was answered and I agree with the answer.
-  -1:
-  rjung: +1 once Filip's question in the TC 6 STATUS file is cleared.
-
+* https://issues.apache.org/bugzilla/show_bug.cgi?id=50550
   Additional patch (not important):
   http://svn.apache.org/viewvc?rev=1056828view=rev
   +1: kkolinko, markt

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java?rev=1061401r1=1061400r2=1061401view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java
 Thu Jan 20 17:16:52 2011
@@ -1612,10 +1612,16 @@ public class ProxyDirContext implements 
 if (cache == null)
 return false;
 synchronized (cache) {
-return cache.unload(name);
+boolean result = cache.unload(name);
+// To ensure correct operation, particularly of WebDAV, unload
+// the resource with and without a trailing /
+if (name.endsWith(/)) {
+cache.unload(name.substring(0, name.length() -1));
+} else {
+cache.unload(name + /);
+}
+return result;
 }
 }
-
-
 }
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 50550] PropFind 404 error after MkCol succes

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=50550

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #3 from Mark Thomas ma...@apache.org 2011-01-20 12:17:20 EST ---
Fixed in 5.5.x and will be included in 5.5.32 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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061404 - /tomcat/tc6.0.x/trunk/STATUS.txt

[fhanik]

Author: fhanik
Date: Thu Jan 20 17:20:36 2011
New Revision: 1061404

URL: http://svn.apache.org/viewvc?rev=1061404view=rev
Log:
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=1061404r1=1061403r2=1061404view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 20 17:20:36 2011
@@ -93,7 +93,7 @@ PATCHES PROPOSED TO BACKPORT:
   Adds ~10% to the session creation/destruction process when that is all Tomcat
   is doing. Should be less overhead with less contention.
   http://people.apache.org/~markt/patches/2010-11-18-session-rate-stats.patch
-  +1: markt, rjung
+  +1: markt, rjung, fhanik
   -1:
   rjung: getSessionExpireRate() and getSessionCreateRate() could share a common
  implementation (same method body except for the input list). The 
member
@@ -121,7 +121,7 @@ PATCHES PROPOSED TO BACKPORT:
   https://issues.apache.org/bugzilla/show_bug.cgi?id=50550
   Additional patch (not important):
   http://svn.apache.org/viewvc?rev=1056828view=rev
-  +1: kkolinko, markt
+  +1: kkolinko, markt, fhanik
   -1:
   
 * Add helper class to allow a shared data source with different credentials



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061405 - in /tomcat/tc5.5.x/trunk: container/catalina/src/share/org/apache/naming/resources/ImmutableNameNotFoundException.java container/webapps/docs/changelog.xml jasper/src/share/org/

[markt]

Author: markt
Date: Thu Jan 20 17:21:39 2011
New Revision: 1061405

URL: http://svn.apache.org/viewvc?rev=1061405view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50460
Avoid leak caused by using a cached exception instance

Modified:

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/ImmutableNameNotFoundException.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml

tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/JspDocumentParser.java

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/ImmutableNameNotFoundException.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/ImmutableNameNotFoundException.java?rev=1061405r1=1061404r2=1061405view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/ImmutableNameNotFoundException.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/ImmutableNameNotFoundException.java
 Thu Jan 20 17:21:39 2011
@@ -37,4 +37,8 @@ public class ImmutableNameNotFoundExcept
 public void setResolverName(Name name) {}
 public void setRootCause(Throwable e) {}
 
+public synchronized Throwable fillInStackTrace() {
+// This class does not provide a stack trace
+return this;
+}
 }

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1061405r1=1061404r2=1061405view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Thu Jan 20 
17:21:39 2011
@@ -71,6 +71,10 @@
   fix
 Avoid unnecessary cast in StandardContext. (markt)
   /fix
+  fix
+bug50460/bug: Avoid a possible memory leak caused by using a cached
+exception instance. (kkolinko)
+  /fix
 /changelog
   /subsection
   subsection name=Coyote

Modified: 
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/JspDocumentParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/JspDocumentParser.java?rev=1061405r1=1061404r2=1061405view=diff
==
--- 
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/JspDocumentParser.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/JspDocumentParser.java
 Thu Jan 20 17:21:39 2011
@@ -60,11 +60,6 @@ class JspDocumentParser
 http://xml.org/sax/properties/lexical-handler;;
 private static final String JSP_URI = http://java.sun.com/JSP/Page;;
 
-private static final EnableDTDValidationException 
ENABLE_DTD_VALIDATION_EXCEPTION =
-new EnableDTDValidationException(
-jsp.error.enable_dtd_validation,
-null);
-
 private ParserController parserController;
 private JspCompilationContext ctxt;
 private PageInfo pageInfo;
@@ -732,7 +727,8 @@ class JspDocumentParser
 public void startDTD(String name, String publicId, String systemId)
 throws SAXException {
 if (!isValidating) {
-fatalError(ENABLE_DTD_VALIDATION_EXCEPTION);
+fatalError(new EnableDTDValidationException(
+jsp.error.enable_dtd_validation, null));
 }
 
 inDTD = true;
@@ -1425,6 +1421,11 @@ class JspDocumentParser
 EnableDTDValidationException(String message, Locator loc) {
 super(message, loc);
 }
+
+public synchronized Throwable fillInStackTrace() {
+// This class does not provide a stack trace
+return this;
+}
 }
 
 private static String getBodyType(Node.CustomTag custom) {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 50460] First access to a jspx page causes classloader leak in JspDocumentParser

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=50460

--- Comment #7 from Mark Thomas ma...@apache.org 2011-01-20 12:21:53 EST ---
Fixed in 5.5.x and will be included in 5.5.32 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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061406 - /tomcat/tc5.5.x/trunk/STATUS.txt

[markt]

Author: markt
Date: Thu Jan 20 17:22:25 2011
New Revision: 1061406

URL: http://svn.apache.org/viewvc?rev=1061406view=rev
Log:
Remove applied fix

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1061406r1=1061405r2=1061406view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Jan 20 17:22:25 2011
@@ -71,13 +71,6 @@ PATCHES PROPOSED TO BACKPORT:
patched tomcat.nsi of tc5.5 on top of it:
(  
http://people.apache.org/~kkolinko/patches/2011-01-17_tc55_tomcat-nsi-of-tc7_vs_tc55.diff
 )
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50460
-  Avoid leak caused by using a cached exception instance
-  http://svn.apache.org/viewvc?rev=1044987view=rev
-  (without the @Override annotations)
-  +1: kkolinko, rjung, markt
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50547
   Add time stamp for CHANGE_SESSION_ID and SESSION_EXPIRED message.
   http://svn.apache.org/viewvc?view=revisionrevision=1055798



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061412 - in /tomcat/trunk: java/org/apache/catalina/servlets/CGIServlet.java webapps/docs/cgi-howto.xml webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Thu Jan 20 17:43:35 2011
New Revision: 1061412

URL: http://svn.apache.org/viewvc?rev=1061412view=rev
Log:
Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=50606
Improve CGIServlet: Provide support for specifying empty value for the 
executable init-param. Provide support for explicit additional arguments for 
the executable. Those were broken when implementing fix for bug 49657

Modified:
tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/trunk/webapps/docs/cgi-howto.xml
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1061412r1=1061411r2=1061412view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Thu Jan 20 
17:43:35 2011
@@ -32,6 +32,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.Hashtable;
+import java.util.List;
 import java.util.Locale;
 import java.util.StringTokenizer;
 import java.util.Vector;
@@ -257,7 +258,10 @@ public final class CGIServlet extends Ht
 
 /** the executable to use with the script */
 private String cgiExecutable = perl;
-
+
+/** additional arguments for the executable */
+private ListString cgiExecutableArgs = null;
+
 /** the encoding to use for parameters */
 private String parameterEncoding =
 System.getProperty(file.encoding, UTF-8);
@@ -309,6 +313,19 @@ public final class CGIServlet extends Ht
 cgiExecutable = getServletConfig().getInitParameter(executable);
 }
 
+if (getServletConfig().getInitParameter(executable-arg-1) != null) {
+ListString args = new ArrayListString();
+for (int i = 1;; i++) {
+String arg = getServletConfig().getInitParameter(
+executable-arg- + i);
+if (arg == null) {
+break;
+}
+args.add(arg);
+}
+cgiExecutableArgs = args;
+}
+
 if (getServletConfig().getInitParameter(parameterEncoding) != null) {
 parameterEncoding = 
getServletConfig().getInitParameter(parameterEncoding);
 }
@@ -1578,20 +1595,21 @@ public final class CGIServlet extends Ht
 Process proc = null;
 int bufRead = -1;
 
-String[] cmdAndArgs = new String[params.size() + 2];
-
-cmdAndArgs[0] = cgiExecutable;
-
-cmdAndArgs[1] = command;
-
-//create query arguments
-for (int i=0; i  params.size(); i++) {
-cmdAndArgs[i + 2] = params.get(i);
+ListString cmdAndArgs = new ArrayListString();
+if (cgiExecutable.length() != 0) {
+cmdAndArgs.add(cgiExecutable);
+}
+if (cgiExecutableArgs != null) {
+cmdAndArgs.addAll(cgiExecutableArgs);
 }
+cmdAndArgs.add(command);
+cmdAndArgs.addAll(params);
 
 try {
 rt = Runtime.getRuntime();
-proc = rt.exec(cmdAndArgs, hashToStringArray(env), wd);
+proc = rt.exec(
+cmdAndArgs.toArray(new String[cmdAndArgs.size()]),
+hashToStringArray(env), wd);
 
 String sContentLength = env.get(CONTENT_LENGTH);
 

Modified: tomcat/trunk/webapps/docs/cgi-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/cgi-howto.xml?rev=1061412r1=1061411r2=1061412view=diff
==
--- tomcat/trunk/webapps/docs/cgi-howto.xml (original)
+++ tomcat/trunk/webapps/docs/cgi-howto.xml Thu Jan 20 17:43:35 2011
@@ -80,9 +80,14 @@ The default cgiPathPrefix is codeWEB-I
 listrongdebug/strong - Debugging detail level for messages logged
 by this servlet. Default 0./li
 listrongexecutable/strong - The of the executable to be used to
-run the script. Default is codeperl/code./li
+run the script. You may explicitly set this parameter to be an empty string
+if your script is itself executable (e.g. an exe file). Default is
+codeperl/code./li
+listrongexecutable-arg-1/strong, strongexecutable-arg-2/strong,
+and so on - additional arguments for the executable. These precede the
+CGI script name. By default there are no additional arguments./li
 listrongparameterEncoding/strong - Name of the parameter encoding
-to be used with the GCI servlet. Default is
+to be used with the CGI servlet. Default is
 codeSystem.getProperty(file.encoding,UTF-8)/code./li
 listrongpassShellEnvironment/strong - Should the shell environment
 variables (if any) be passed to the 

svn commit: r1061414 - /tomcat/tc6.0.x/trunk/STATUS.txt

[kkolinko]

Author: kkolinko
Date: Thu Jan 20 17:46:29 2011
New Revision: 1061414

URL: http://svn.apache.org/viewvc?rev=1061414view=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=1061414r1=1061413r2=1061414view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 20 17:46:29 2011
@@ -138,3 +138,11 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=1061397view=rev
   +1: kkolinko
   -1:
+
+* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=50606
+  Improve CGIServlet. Provide support for specifying empty value for the
+  executable init-param. Provide support for explicit additional arguments
+  for the executable. Those were broken when implementing fix for bug 49657.
+  http://svn.apache.org/viewvc?rev=1061412view=rev
+  +1: kkolinko
+  -1:



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 50606] Error running CGI executable in Tomcat 6.0.30

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=50606

Konstantin Kolinko knst.koli...@gmail.com changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|INVALID |

--- Comment #2 from Konstantin Kolinko knst.koli...@gmail.com 2011-01-20 
12:48:02 EST ---
Discussed on dev@
Fixed in trunk in r1061412 and will be in 7.0.7.
Proposed for 6.0.x

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061421 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/coyote/http11/Http11NioProtocol.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Jan 20 17:55:51 2011
New Revision: 1061421

URL: http://svn.apache.org/viewvc?rev=1061421view=rev
Log: (empty)

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 20 17:55:51 2011
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77
 
0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901
 
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686
 
,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1055055,1055236,1055458,1055975,1056264,1056889,1059881

svn commit: r1061422 - /tomcat/tc6.0.x/trunk/STATUS.txt

[markt]

Author: markt
Date: Thu Jan 20 17:57:38 2011
New Revision: 1061422

URL: http://svn.apache.org/viewvc?rev=1061422view=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=1061422r1=1061421r2=1061422view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 20 17:57:38 2011
@@ -129,9 +129,10 @@ PATCHES PROPOSED TO BACKPORT:
   +1: fhanik, funkman
   -1:
 
+  Fix very large memory leak in NIO connector
   Additional patch (not important):
   http://svn.apache.org/viewvc?rev=1061397view=rev
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=50606



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn propchange: r1061421 - svn:log

[markt]

Author: markt
Revision: 1061421
Modified property: svn:log

Modified: svn:log at Thu Jan 20 17:58:28 2011
--
--- svn:log (original)
+++ svn:log Thu Jan 20 17:58:28 2011
@@ -0,0 +1 @@
+Fix very large memory leak in NIO connector


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061433 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/ha/session/ java/org/apache/catalina/session/ webapps/docs/

[markt]

Author: markt
Date: Thu Jan 20 18:10:16 2011
New Revision: 1061433

URL: http://svn.apache.org/viewvc?rev=1061433view=rev
Log:
Add session creation / expiration rate statistics to the session managers
Adds ~10% to the session creation/destruction process when that is all Tomcat 
is doing. Should be less overhead with less contention.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml
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=1061433r1=1061432r2=1061433view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 20 18:10:16 2011
@@ -89,16 +89,6 @@ PATCHES PROPOSED TO BACKPORT:
   We can stall this item until we get some feedback about 7.0.5.
   -1:
 
-* Add session creation / expiration rate statistics to the session managers
-  Adds ~10% to the session creation/destruction process when that is all Tomcat
-  is doing. Should be less overhead with less contention.
-  http://people.apache.org/~markt/patches/2010-11-18-session-rate-stats.patch
-  +1: markt, rjung, fhanik
-  -1:
-  rjung: getSessionExpireRate() and getSessionCreateRate() could share a common
- implementation (same method body except for the input list). The 
member
-  duration of SessionTiming does not seem to get used.
-
 * Backport AprEndpoint shutdown patch (BZ49795 and similar).
   http://people.apache.org/~mturk/tomcat/patches/tomcat-6.0.x-aprshutdown.patch
   +1: mturk

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1061433r1=1061432r2=1061433view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java 
Thu Jan 20 18:10:16 2011
@@ -40,6 +40,7 @@ import org.apache.catalina.core.Standard
 import org.apache.catalina.ha.CatalinaCluster;
 import org.apache.catalina.ha.ClusterMessage;
 import org.apache.catalina.ha.tcp.ReplicationValve;
+import org.apache.catalina.session.ManagerBase;
 import org.apache.catalina.tribes.Member;
 import org.apache.catalina.tribes.io.ReplicationStream;
 import org.apache.catalina.util.LifecycleSupport;
@@ -1286,6 +1287,16 @@ public class DeltaManager extends Cluste
 public synchronized void resetStatistics() {
 processingTime = 0 ;
 expiredSessions = 0 ;
+sessionCreationTiming.clear();
+while (sessionCreationTiming.size() 
+ManagerBase.TIMING_STATS_CACHE_SIZE) {
+sessionCreationTiming.add(null);
+}
+sessionExpirationTiming.clear();
+while (sessionExpirationTiming.size() 
+ManagerBase.TIMING_STATS_CACHE_SIZE) {
+sessionExpirationTiming.add(null);
+}
 rejectedSessions = 0 ;
 sessionReplaceCounter = 0 ;
 counterNoStateTransfered = 0 ;

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1061433r1=1061432r2=1061433view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java Thu 
Jan 20 18:10:16 2011
@@ -30,10 +30,13 @@ import java.security.AccessController;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.PrivilegedAction;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.ConcurrentHashMap;
@@ -165,6 +168,15 @@ public abstract class ManagerBase implem
 protected int sessionAverageAliveTime;
 
 
+protected static final int TIMING_STATS_CACHE_SIZE = 100;
+
+protected LinkedListSessionTiming sessionCreationTiming =
+new LinkedListSessionTiming();
+
+protected LinkedListSessionTiming sessionExpirationTiming =
+new LinkedListSessionTiming();
+
+
 /**
  * Number of sessions that have expired.
  */
@@ -752,6 +764,15 @@ public 

Re: Need a 6.0.31 release

[Mark Thomas]

On 20/01/2011 18:04, Konstantin Kolinko wrote:
 2011/1/20 Mark Thomas ma...@apache.org:
 The memory leak in the Tomcat 7 NIO connector [1] got back-ported to
 6.0.x and included in 6.0.30. [2]

 I have proposed the fix for 6.0.x. Given the severity I think we need to
 approve the backport and start a 6.0.31 release asap.

 
 +1
 
 What about the following issue as well: ?
 https://issues.apache.org/bugzilla/show_bug.cgi?id=50620

Sure. I was about to look at that when the memory leak stuff kicked off.
Then I got distracted applying all the approved patches in the status file.

 There is a patch available.

Great.

If we can handle that as quickly as the OOME then we should be fine.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061438 - /tomcat/trunk/java/org/apache/catalina/connector/Response.java

[markt]

Author: markt
Date: Thu Jan 20 18:27:02 2011
New Revision: 1061438

URL: http://svn.apache.org/viewvc?rev=1061438view=rev
Log:
Update info - should probably just delete all these

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Response.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1061438r1=1061437r2=1061438view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Thu Jan 20 
18:27:02 2011
@@ -100,7 +100,7 @@ public class Response
  * Descriptive information about this Response implementation.
  */
 protected static final String info =
-org.apache.coyote.tomcat5.CoyoteResponse/1.0;
+org.apache.coyote.catalina.CoyoteResponse/1.0;
 
 
 /**



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Need a 6.0.31 release

[Henri Gomez]

 What about the following issue as well: ?
 https://issues.apache.org/bugzilla/show_bug.cgi?id=50620

 Sure. I was about to look at that when the memory leak stuff kicked off.
 Then I got distracted applying all the approved patches in the status file.

 There is a patch available.

 Great.

 If we can handle that as quickly as the OOME then we should be fine.

+1

Nice to have a 6.0.31 fixing serious problems so quickly !

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061442 - in /tomcat/trunk/java/org/apache/catalina/connector: LocalStrings.properties Request.java

[markt]

Author: markt
Date: Thu Jan 20 18:34:18 2011
New Revision: 1061442

URL: http://svn.apache.org/viewvc?rev=1061442view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50620
Exceptions calling session.endAccess should not prevent recycle() from 
completing normally

Modified:
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/connector/Request.java

Modified: 
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1061442r1=1061441r2=1061442view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties Thu 
Jan 20 18:34:18 2011
@@ -64,6 +64,7 @@ coyoteRequest.alreadyAuthenticated=This 
 coyoteRequest.noLoginConfig=No authentication mechanism has been configured 
for this context
 coyoteRequest.authenticate.ise=Cannot call authenticate() after the reponse 
has been committed
 coyoteRequest.uploadLocationInvalid=The temporary upload location [{0}] is not 
valid
+coyoteRequest.sessionEndAccessFail=Exception triggered ending access to 
session while recycling request
 
 requestFacade.nullRequest=The request object has been recycled and is no 
longer associated with this facade
 

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1061442r1=1061441r2=1061442view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu Jan 20 
18:34:18 2011
@@ -75,6 +75,8 @@ import org.apache.catalina.util.Enumerat
 import org.apache.catalina.util.ParameterMap;
 import org.apache.catalina.util.StringParser;
 import org.apache.coyote.ActionCode;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.ExceptionUtils;
 import org.apache.tomcat.util.buf.B2CConverter;
 import org.apache.tomcat.util.buf.ByteChunk;
@@ -105,7 +107,8 @@ import org.apache.tomcat.util.res.String
 public class Request
 implements HttpServletRequest {
 
-
+private static final Log log = LogFactory.getLog(Connector.class);
+
 // --- Constructors
 
 
@@ -492,7 +495,12 @@ public class Request
 cookies = null;
 
 if (session != null) {
-session.endAccess();
+try {
+session.endAccess();
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+log.warn(sm.getString(coyoteRequest.sessionEndAccessFail), 
t);
+}
 }
 session = null;
 requestedSessionCookie = false;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061443 - /tomcat/tc6.0.x/trunk/STATUS.txt

[markt]

Author: markt
Date: Thu Jan 20 18:36:16 2011
New Revision: 1061443

URL: http://svn.apache.org/viewvc?rev=1061443view=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=1061443r1=1061442r2=1061443view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 20 18:36:16 2011
@@ -126,3 +126,9 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=1061412view=rev
   +1: kkolinko
   -1:
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50620
+  http://svn.apache.org/viewvc?rev=1061442view=rev
+  Plus copy o.a.tomcat.util.ExceptionUtils from trunk
+  +1: markt
+  -1:



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 50620] Session related errors prevent clean recycle of Request and Response objects by CoyoteAdapter

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=50620

--- Comment #1 from Mark Thomas ma...@apache.org 2011-01-20 13:36:30 EST ---
Thanks for the report.

Fixed in 7.0.x and will be in 7.0.7 onwards.

I used a slightly different patch but it does the same thing.

I have proposed a back-port of the fix for 6.0.x

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1061442 - in /tomcat/trunk/java/org/apache/catalina/connector: LocalStrings.properties Request.java

[Konstantin Kolinko]

2011/1/20  ma...@apache.org:
 Author: markt
 Date: Thu Jan 20 18:34:18 2011
 New Revision: 1061442


 Modified:
    tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/connector/Request.java

 --- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
 +++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu Jan 20 
 18:34:18 2011
 @@ -105,7 +107,8 @@ import org.apache.tomcat.util.res.String
  public class Request
     implements HttpServletRequest {

 -
 +    private static final Log log = LogFactory.getLog(Connector.class);
 +
Should be getLog(Request.class);

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061446 - /tomcat/trunk/java/org/apache/catalina/connector/Request.java

[markt]

Author: markt
Date: Thu Jan 20 18:40:23 2011
New Revision: 1061446

URL: http://svn.apache.org/viewvc?rev=1061446view=rev
Log:
Fix copy/paste snafu

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1061446r1=1061445r2=1061446view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu Jan 20 
18:40:23 2011
@@ -107,7 +107,7 @@ import org.apache.tomcat.util.res.String
 public class Request
 implements HttpServletRequest {
 
-private static final Log log = LogFactory.getLog(Connector.class);
+private static final Log log = LogFactory.getLog(Request.class);
 
 // --- Constructors
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061447 - /tomcat/tc6.0.x/trunk/STATUS.txt

[markt]

Author: markt
Date: Thu Jan 20 18:42:09 2011
New Revision: 1061447

URL: http://svn.apache.org/viewvc?rev=1061447view=rev
Log:
Additional patch
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=1061447r1=1061446r2=1061447view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 20 18:42:09 2011
@@ -124,11 +124,12 @@ PATCHES PROPOSED TO BACKPORT:
   executable init-param. Provide support for explicit additional arguments
   for the executable. Those were broken when implementing fix for bug 49657.
   http://svn.apache.org/viewvc?rev=1061412view=rev
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50620
   http://svn.apache.org/viewvc?rev=1061442view=rev
+  http://svn.apache.org/viewvc?rev=1061446view=rev
   Plus copy o.a.tomcat.util.ExceptionUtils from trunk
   +1: markt
   -1:



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061451 - /tomcat/tc6.0.x/trunk/STATUS.txt

[kkolinko]

Author: kkolinko
Date: Thu Jan 20 18:45:09 2011
New Revision: 1061451

URL: http://svn.apache.org/viewvc?rev=1061451view=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=1061451r1=1061450r2=1061451view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 20 18:45:09 2011
@@ -112,8 +112,16 @@ PATCHES PROPOSED TO BACKPORT:
   http://people.apache.org/~fhanik/dslink.patch
   +1: fhanik, funkman
   -1:
+   kkolinko:
+1) Need to remove @Override at 
DataSourceLinkFactory.DataSourceHandler#invoke().
+Otherwise it does not compile with Java 5. That is because 
InvocationHandler is an interface.
+2) The following line in NamingContextListener#addResourceLink():
+IteratorString i = resourceLink.listProperties();
+Here ContextResourceLink#listProperties() returns Iterator, not
+IteratorString, but IDE does not give me a warning and I see no
+@SuppressWarnings arround. It is odd.
 
-  Fix very large memory leak in NIO connector
+* Fix very large memory leak in NIO connector
   Additional patch (not important):
   http://svn.apache.org/viewvc?rev=1061397view=rev
   +1: kkolinko, markt
@@ -131,5 +139,5 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=1061442view=rev
   http://svn.apache.org/viewvc?rev=1061446view=rev
   Plus copy o.a.tomcat.util.ExceptionUtils from trunk
-  +1: markt
+  +1: markt, kkolinko
   -1:



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061461 - in /tomcat/trunk/webapps/docs: changelog.xml jndi-resources-howto.xml

[markt]

Author: markt
Date: Thu Jan 20 19:05:38 2011
New Revision: 1061461

URL: http://svn.apache.org/viewvc?rev=1061461view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50526
Additional JavaMail docs

Modified:
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/jndi-resources-howto.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1061461r1=1061460r2=1061461view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jan 20 19:05:38 2011
@@ -127,6 +127,10 @@
 the default cluster membership. (markt)
   /fix
   fix
+bug50526/bug: Provide additional documetation on configuring
+JavaMail resources. (markt)
+  /fix
+  fix
 bug50599/bug: Use correct names of roles required to access the 
 Manager application. (markt)
   /fix

Modified: tomcat/trunk/webapps/docs/jndi-resources-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-resources-howto.xml?rev=1061461r1=1061460r2=1061461view=diff
==
--- tomcat/trunk/webapps/docs/jndi-resources-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jndi-resources-howto.xml Thu Jan 20 19:05:38 2011
@@ -492,6 +492,14 @@ Transport.send(message);
 Customize the value of the codemail.smtp.host/code parameter to
 point at the server that provides SMTP service for your network./p
 
+pAdditional resource attributes and values will be converted to 
properties
+and values and passed to
+codejavax.mail.Session.getInstance(java.util.Properties)/code as part 
of
+the codejava.util.Properties/code collection. In addition to the
+properties defined in Annex A of the JavaMail specification, individual
+providers may also support additional properties like 
codepassword/code.
+/p
+
 h34.  Install the JavaMail libraries/h3
 
 pa href=http://www.oracle.com/technetwork/java/index-138643.html;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 50526] Clarify that JavaMail Session JNDI resource factory can accept any configuration attribute from JavaMail

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=50526

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED
 OS/Version||All

--- Comment #1 from Mark Thomas ma...@apache.org 2011-01-20 14:05:38 EST ---
Fixed in 7.0.x and will be included in 7.07. 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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061466 - /tomcat/tc5.5.x/trunk/STATUS.txt

[jim]

Author: jim
Date: Thu Jan 20 19:13:46 2011
New Revision: 1061466

URL: http://svn.apache.org/viewvc?rev=1061466view=rev
Log:
tested and voted

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1061466r1=1061465r2=1061466view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Jan 20 19:13:46 2011
@@ -75,18 +75,18 @@ PATCHES PROPOSED TO BACKPORT:
   Add time stamp for CHANGE_SESSION_ID and SESSION_EXPIRED message.
   http://svn.apache.org/viewvc?view=revisionrevision=1055798
   https://issues.apache.org/bugzilla/attachment.cgi?id=26482 (patch against 
tc5.5)
-  +1: kfujino, markt
+  +1: kfujino, markt, jim
   -1:
 
 * https://issues.apache.org/bugzilla/show_bug.cgi?id=50550
   Additional patch (not important):
   http://svn.apache.org/viewvc?rev=1056828view=rev
-  +1: kkolinko, markt
+  +1: kkolinko, markt, jim
   -1:
 
 * Additional patch for bug 50413:
   Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50413#c6
   Serve the error page regardless of Range header in the original request.
   http://svn.apache.org/viewvc?rev=1056889view=rev
-  +1: kkolinko, markt
+  +1: kkolinko, markt, jim
   -1:



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061467 - /tomcat/tc5.5.x/trunk/STATUS.txt

[jim]

Author: jim
Date: Thu Jan 20 19:14:00 2011
New Revision: 1061467

URL: http://svn.apache.org/viewvc?rev=1061467view=rev
Log:
promote

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1061467r1=1061466r2=1061467view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Jan 20 19:14:00 2011
@@ -25,6 +25,25 @@ $Id$
 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=50547
+  Add time stamp for CHANGE_SESSION_ID and SESSION_EXPIRED message.
+  http://svn.apache.org/viewvc?view=revisionrevision=1055798
+  https://issues.apache.org/bugzilla/attachment.cgi?id=26482 (patch against 
tc5.5)
+  +1: kfujino, markt, jim
+  -1:
+
+* https://issues.apache.org/bugzilla/show_bug.cgi?id=50550
+  Additional patch (not important):
+  http://svn.apache.org/viewvc?rev=1056828view=rev
+  +1: kkolinko, markt, jim
+  -1:
+
+* Additional patch for bug 50413:
+  Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50413#c6
+  Serve the error page regardless of Range header in the original request.
+  http://svn.apache.org/viewvc?rev=1056889view=rev
+  +1: kkolinko, markt, jim
+  -1:
 
 * Remove JSSE13Factory, JSSE13SocketFactory classes,
   because
@@ -71,22 +90,3 @@ PATCHES PROPOSED TO BACKPORT:
patched tomcat.nsi of tc5.5 on top of it:
(  
http://people.apache.org/~kkolinko/patches/2011-01-17_tc55_tomcat-nsi-of-tc7_vs_tc55.diff
 )
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50547
-  Add time stamp for CHANGE_SESSION_ID and SESSION_EXPIRED message.
-  http://svn.apache.org/viewvc?view=revisionrevision=1055798
-  https://issues.apache.org/bugzilla/attachment.cgi?id=26482 (patch against 
tc5.5)
-  +1: kfujino, markt, jim
-  -1:
-
-* https://issues.apache.org/bugzilla/show_bug.cgi?id=50550
-  Additional patch (not important):
-  http://svn.apache.org/viewvc?rev=1056828view=rev
-  +1: kkolinko, markt, jim
-  -1:
-
-* Additional patch for bug 50413:
-  Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50413#c6
-  Serve the error page regardless of Range header in the original request.
-  http://svn.apache.org/viewvc?rev=1056889view=rev
-  +1: kkolinko, markt, jim
-  -1:



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061469 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java

[jim]

Author: jim
Date: Thu Jan 20 19:17:53 2011
New Revision: 1061469

URL: http://svn.apache.org/viewvc?rev=1061469view=rev
Log:
Merge r1056889 from trunk:
Submitted by: kkolinko
Reviewed/backported by: jim

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1061469r1=1061468r2=1061469view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Jan 20 19:17:53 2011
@@ -38,13 +38,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko, markt, jim
   -1:
 
-* Additional patch for bug 50413:
-  Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50413#c6
-  Serve the error page regardless of Range header in the original request.
-  http://svn.apache.org/viewvc?rev=1056889view=rev
-  +1: kkolinko, markt, jim
-  -1:
-
 * Remove JSSE13Factory, JSSE13SocketFactory classes,
   because
 - TC 5.5 runs on JRE 1.4+ and that comes bundled with JSSE 1.4,

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java?rev=1061469r1=1061468r2=1061469view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
 Thu Jan 20 19:17:53 2011
@@ -892,6 +892,7 @@ public class DefaultServlet
 }
 
 if ( (cacheEntry.context != null) 
+|| isError
 || ( ((ranges == null) || (ranges.isEmpty()))
  (request.getHeader(Range) == null) )
 || (ranges == FULL) ) {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061470 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java

[jim]

Author: jim
Date: Thu Jan 20 19:19:40 2011
New Revision: 1061470

URL: http://svn.apache.org/viewvc?rev=1061470view=rev
Log:
Merge r1056828 from trunk:
Submitted by: kkolinko
Reviewed/backported by: jim

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1061470r1=1061469r2=1061470view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Jan 20 19:19:40 2011
@@ -32,12 +32,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kfujino, markt, jim
   -1:
 
-* https://issues.apache.org/bugzilla/show_bug.cgi?id=50550
-  Additional patch (not important):
-  http://svn.apache.org/viewvc?rev=1056828view=rev
-  +1: kkolinko, markt, jim
-  -1:
-
 * Remove JSSE13Factory, JSSE13SocketFactory classes,
   because
 - TC 5.5 runs on JRE 1.4+ and that comes bundled with JSSE 1.4,

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java?rev=1061470r1=1061469r2=1061470view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java
 Thu Jan 20 19:19:40 2011
@@ -1611,15 +1611,17 @@ public class ProxyDirContext implements 
 protected boolean cacheUnload(String name) {
 if (cache == null)
 return false;
+// To ensure correct operation, particularly of WebDAV, unload
+// the resource with and without a trailing /
+String name2;
+if (name.endsWith(/)) {
+name2 = name.substring(0, name.length() -1);
+} else {
+name2 = name + /;
+}
 synchronized (cache) {
 boolean result = cache.unload(name);
-// To ensure correct operation, particularly of WebDAV, unload
-// the resource with and without a trailing /
-if (name.endsWith(/)) {
-cache.unload(name.substring(0, name.length() -1));
-} else {
-cache.unload(name + /);
-}
+cache.unload(name2);
 return result;
 }
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061471 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java container/modules/ha/src/share/org/apache/catalina

[jim]

Author: jim
Date: Thu Jan 20 19:21:41 2011
New Revision: 1061471

URL: http://svn.apache.org/viewvc?rev=1061471view=rev
Log:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50547
  Add time stamp for CHANGE_SESSION_ID and SESSION_EXPIRED message.
http://svn.apache.org/viewvc?view=revisionrevision=1055798
  https://issues.apache.org/bugzilla/attachment.cgi?id=26482 (patch against 
tc5.5)
+1: kfujino, markt, jim
  -1:



Modified:
tomcat/tc5.5.x/trunk/STATUS.txt

tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java

tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1061471r1=1061470r2=1061471view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Jan 20 19:21:41 2011
@@ -25,13 +25,6 @@ $Id$
 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=50547
-  Add time stamp for CHANGE_SESSION_ID and SESSION_EXPIRED message.
-  http://svn.apache.org/viewvc?view=revisionrevision=1055798
-  https://issues.apache.org/bugzilla/attachment.cgi?id=26482 (patch against 
tc5.5)
-  +1: kfujino, markt, jim
-  -1:
-
 * Remove JSSE13Factory, JSSE13SocketFactory classes,
   because
 - TC 5.5 runs on JRE 1.4+ and that comes bundled with JSSE 1.4,

Modified: 
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java?rev=1061471r1=1061470r2=1061471view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
 Thu Jan 20 19:21:41 2011
@@ -749,6 +749,7 @@ public class DeltaManager extends Manage
 SessionMessage.EVT_CHANGE_SESSION_ID, data,
 orgSessionID, orgSessionID + -
 + System.currentTimeMillis());
+msg.setTimestamp(System.currentTimeMillis());
 counterSend_EVT_CHANGE_SESSION_ID++;
 send(msg);
 } catch (IOException e) {
@@ -1534,6 +1535,7 @@ public class DeltaManager extends Manage
 SessionMessage msg = new SessionMessageImpl(getName(),
 SessionMessage.EVT_SESSION_EXPIRED, null, id, id
 + -EXPIRED-MSG);
+msg.setTimestamp(System.currentTimeMillis());
 if (log.isDebugEnabled())
 log.debug(sm.getString(deltaManager.createMessage.expire,
 getName(), id));

Modified: 
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java?rev=1061471r1=1061470r2=1061471view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
 Thu Jan 20 19:21:41 2011
@@ -644,6 +644,7 @@ public class DeltaManager extends Cluste
 SessionMessage.EVT_CHANGE_SESSION_ID, data,
 orgSessionID, orgSessionID + -
 + System.currentTimeMillis());
+msg.setTimestamp(System.currentTimeMillis());
 counterSend_EVT_CHANGE_SESSION_ID++;
 send(msg);
 } catch (IOException e) {
@@ -1307,6 +1308,7 @@ public class DeltaManager extends Cluste
 protected void sessionExpired(String id) {
 counterSend_EVT_SESSION_EXPIRED++ ;
 SessionMessage msg = new 
SessionMessageImpl(getName(),SessionMessage.EVT_SESSION_EXPIRED, null, id, id+ 
-EXPIRED-MSG);
+msg.setTimestamp(System.currentTimeMillis());
 if (log.isDebugEnabled()) 
log.debug(sm.getString(deltaManager.createMessage.expire,getName(), id));
 send(msg);
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 50413] Tomcat returns 304 instead of 404 response for static custom 404 error file

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=50413

Jim Jagielski j...@apache.org changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED

--- Comment #9 from Jim Jagielski j...@apache.org 2011-01-20 14:23:11 EST ---
Will be in 5.5.32

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 50550] PropFind 404 error after MkCol succes

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=50550

--- Comment #4 from Jim Jagielski j...@apache.org 2011-01-20 14:23:43 EST ---
Will be in 5.5.32

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Time for 5.5.32??

[Jim Jagielski]

All remaining code-level changes have been added...
Will tag and roll either later on today or over the weekend.

On Jan 18, 2011, at 10:57 AM, jean-frederic clere wrote:

 On 01/17/2011 03:02 PM, Jim Jagielski wrote:
 I'd like to look over the remaining STATUS of 5.5 in hopes of
 getting a 5.5.32 out soon... I'll RM.
 
 Comments?
 
 +1
 
 Cheers
 
 Jean-Frederic
 
 -
 To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
 For additional commands, e-mail: dev-h...@tomcat.apache.org
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1061451 - /tomcat/tc6.0.x/trunk/STATUS.txt

[Filip Hanik - Dev Lists]

On 1/20/2011 11:45 AM, kkoli...@apache.org wrote:

Author: kkolinko
Date: Thu Jan 20 18:45:09 2011
New Revision: 1061451

URL: http://svn.apache.org/viewvc?rev=1061451view=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=1061451r1=1061450r2=1061451view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 20 18:45:09 2011
@@ -112,8 +112,16 @@ PATCHES PROPOSED TO BACKPORT:
http://people.apache.org/~fhanik/dslink.patch
+1: fhanik, funkman
-1:
+   kkolinko:
+1) Need to remove @Override at 
DataSourceLinkFactory.DataSourceHandler#invoke().
+Otherwise it does not compile with Java 5. That is because 
InvocationHandler is an interface.
+2) The following line in NamingContextListener#addResourceLink():
+IteratorString  i = resourceLink.listProperties();
+Here ContextResourceLink#listProperties() returns Iterator, not
+IteratorString, but IDE does not give me a warning and I see no
+@SuppressWarnings arround. It is odd.


done.

Filip


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061481 - /tomcat/tc5.5.x/trunk/STATUS.txt

[kkolinko]

Author: kkolinko
Date: Thu Jan 20 19:52:32 2011
New Revision: 1061481

URL: http://svn.apache.org/viewvc?rev=1061481view=rev
Log:
proposal

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1061481r1=1061480r2=1061481view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Jan 20 19:52:32 2011
@@ -70,3 +70,12 @@ PATCHES PROPOSED TO BACKPORT:
patched tomcat.nsi of tc5.5 on top of it:
(  
http://people.apache.org/~kkolinko/patches/2011-01-17_tc55_tomcat-nsi-of-tc7_vs_tc55.diff
 )
 
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50620
+  Exceptions calling session.endAccess should not prevent recycle() from 
completing normally
+  1) copy o.a.tomcat.util.ExceptionUtils from trunk
+  2) patches:
+   http://svn.apache.org/viewvc?rev=1061442view=rev
+   http://svn.apache.org/viewvc?rev=1061446view=rev
+  (by markt)
+  +1: kkolinko
+  -1:



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061485 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

[schultz]

Author: schultz
Date: Thu Jan 20 20:07:08 2011
New Revision: 1061485

URL: http://svn.apache.org/viewvc?rev=1061485view=rev
Log:
s/Tomcar/Tomcat/

Modified:
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

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=1061485r1=1061484r2=1061485view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jan 20 20:07:08 2011
@@ -43,7 +43,7 @@
 !-- Section names:
  General, Catalina, Coyote, Jasper, Cluster, Webapps, Other
 --
-section name=Tomcar 6.0.31 (jfclere)
+section name=Tomcat 6.0.31 (jfclere)
   subsection name=Catalina
 changelog
   add



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061495 - /tomcat/tc6.0.x/trunk/STATUS.txt

[kkolinko]

Author: kkolinko
Date: Thu Jan 20 20:25:55 2011
New Revision: 1061495

URL: http://svn.apache.org/viewvc?rev=1061495view=rev
Log:
patch was updated and is ok now. 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=1061495r1=1061494r2=1061495view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 20 20:25:55 2011
@@ -110,16 +110,8 @@ PATCHES PROPOSED TO BACKPORT:
 
 * Add helper class to allow a shared data source with different credentials
   http://people.apache.org/~fhanik/dslink.patch
-  +1: fhanik, funkman
+  +1: fhanik, funkman, kkolinko
   -1:
-   kkolinko:
-1) Need to remove @Override at 
DataSourceLinkFactory.DataSourceHandler#invoke().
-Otherwise it does not compile with Java 5. That is because 
InvocationHandler is an interface.
-2) The following line in NamingContextListener#addResourceLink():
-IteratorString i = resourceLink.listProperties();
-Here ContextResourceLink#listProperties() returns Iterator, not
-IteratorString, but IDE does not give me a warning and I see no
-@SuppressWarnings arround. It is odd.
 
 * Fix very large memory leak in NIO connector
   Additional patch (not important):



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061503 - in /tomcat/trunk/webapps/docs: changelog.xml config/context.xml

[markt]

Author: markt
Date: Thu Jan 20 20:43:12 2011
New Revision: 1061503

URL: http://svn.apache.org/viewvc?rev=1061503view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50441
Clarify when docBase can be set

Modified:
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/context.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1061503r1=1061502r2=1061503view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jan 20 20:43:12 2011
@@ -127,6 +127,10 @@
 the default cluster membership. (markt)
   /fix
   fix
+bug50441/bug: Clarify when it is valid to set the docBase attribute
+in a Context element. (markt)
+  /fix
+  fix
 bug50526/bug: Provide additional documetation on configuring
 JavaMail resources. (markt)
   /fix

Modified: tomcat/trunk/webapps/docs/config/context.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/context.xml?rev=1061503r1=1061502r2=1061503view=diff
==
--- tomcat/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/trunk/webapps/docs/config/context.xml Thu Jan 20 20:43:12 2011
@@ -231,9 +231,9 @@
 an absolute pathname for this directory or WAR file, or a pathname
 that is relative to the codeappBase/code directory of the
 owning a href=host.htmlHost/a./p
-pThe value of this field must not be set when the Context is
-configured using a codeMETA-INF/context.xml/code file as it will be
-inferred by the automatic deployment process./p
+pThe value of this field must not be set unless the Context element 
is
+defined in server.xml or the codedocBase/code is not located under
+the a href=host.htmlHost/aapos;s codeappBase/code./p
   /attribute
 
   attribute name=logEffectiveWebXml required=false



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 50441] It is not possible to have multiple instacnes of same docBase inside appBase

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=50441

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED

--- Comment #4 from Mark Thomas ma...@apache.org 2011-01-20 15:43:31 EST ---
I have updated the docs. The update will be included in 7.0.7 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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061506 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/deploy/ java/org/apache/naming/factory/ webapps/docs/ webapps/docs/config/

[kkolinko]

Author: kkolinko
Date: Thu Jan 20 20:54:23 2011
New Revision: 1061506

URL: http://svn.apache.org/viewvc?rev=1061506view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=49543
Add the ability to specify a data source link, to use a shared datasource with 
per application credentials.
(fhanik)
Backported documentation update from r1055989 as well.

Added:

tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java
  - copied, changed from r1061505, 
tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/ContextResourceLink.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1061506r1=1061505r2=1061506view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 20 20:54:23 2011
@@ -108,11 +108,6 @@ PATCHES PROPOSED TO BACKPORT:
  sufficient
   -1:
 
-* Add helper class to allow a shared data source with different credentials
-  http://people.apache.org/~fhanik/dslink.patch
-  +1: fhanik, funkman, kkolinko
-  -1:
-
 * Fix very large memory leak in NIO connector
   Additional patch (not important):
   http://svn.apache.org/viewvc?rev=1061397view=rev

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1061506r1=1061505r2=1061506view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java 
Thu Jan 20 20:54:23 2011
@@ -1062,7 +1062,18 @@ public class NamingContextListener
 
 // Create a reference to the resource.
 Reference ref = new ResourceLinkRef
-(resourceLink.getType(), resourceLink.getGlobal());
+(resourceLink.getType(), resourceLink.getGlobal(),
+ resourceLink.getFactory(),null);
+Iterator i = resourceLink.listProperties();
+while (i.hasNext()) {
+String key = i.next().toString();
+Object val = resourceLink.getProperty(key);
+if (val!=null) {
+StringRefAddr refAddr = new StringRefAddr(key, val.toString());
+ref.add(refAddr);
+}
+}
+
 javax.naming.Context ctx = 
 UserTransaction.equals(resourceLink.getName()) 
 ? compCtx : envCtx;

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/ContextResourceLink.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/ContextResourceLink.java?rev=1061506r1=1061505r2=1061506view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/ContextResourceLink.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/ContextResourceLink.java 
Thu Jan 20 20:54:23 2011
@@ -49,7 +49,16 @@ public class ContextResourceLink extends
 this.global = global;
 }
 
+private String factory = null;
 
+public String getFactory() {
+return factory;
+}
+
+public void setFactory(String factory) {
+this.factory = factory;
+}
+
 // - Public Methods
 
 

Copied: 
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java 
(from r1061505, 
tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java)
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java?p2=tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.javap1=tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.javar1=1061505r2=1061506rev=1061506view=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java 
Thu Jan 20 20:54:23 2011
@@ -54,7 +54,7 @@ public class DataSourceLinkFactory exten
  * @param obj The reference object describing the DataSource
  */
 @Override
-public Object getObjectInstance(Object obj, Name name, Context nameCtx, 
Hashtable?,? environment)
+public Object getObjectInstance(Object obj, Name name, Context nameCtx, 
Hashtable environment)
   

svn commit: r1061511 - in /tomcat/trunk/webapps/docs: changelog.xml config/context.xml

[kkolinko]

Author: kkolinko
Date: Thu Jan 20 21:00:10 2011
New Revision: 1061511

URL: http://svn.apache.org/viewvc?rev=1061511view=rev
Log:
Add textual description to the attributes supported by DataSourceLinkFactory
Correct a typo

Modified:
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/context.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1061511r1=1061510r2=1061511view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jan 20 21:00:10 2011
@@ -224,7 +224,7 @@
 (markt)
   /fix
   fix
-bug49543/bug Allow Tomcat to use shared data sources with per
+bug49543/bug: Allow Tomcat to use shared data sources with per
 application credentials. (fhanik)
   /fix
   fix

Modified: tomcat/trunk/webapps/docs/config/context.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/context.xml?rev=1061511r1=1061510r2=1061511view=diff
==
--- tomcat/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/trunk/webapps/docs/config/context.xml Thu Jan 20 21:00:10 2011
@@ -1020,11 +1020,15 @@
 attributes
 
   attribute name=username required=false
-p/p
+pcodeusername/code value for the codegetConnection(username, 
password)/code
+   call on the linked global DataSource.
+/p
   /attribute
 
   attribute name=password required=false
-p/p
+pcodepassword/code value for the codegetConnection(username, 
password)/code
+   call on the linked global DataSource.
+/p
   /attribute
 
 /attributes



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 49543] Request for a shared datasource configuration as in DBCP

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=49543

--- Comment #5 from Konstantin Kolinko knst.koli...@gmail.com 2011-01-20 
16:03:35 EST ---
This feature was backported to Tomcat 6.0 in r1061511 and will be in 6.0.31.

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061515 - /tomcat/tc6.0.x/trunk/STATUS.txt

[fhanik]

Author: fhanik
Date: Thu Jan 20 21:09:55 2011
New Revision: 1061515

URL: http://svn.apache.org/viewvc?rev=1061515view=rev
Log:
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=1061515r1=1061514r2=1061515view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 20 21:09:55 2011
@@ -111,7 +111,7 @@ PATCHES PROPOSED TO BACKPORT:
 * Fix very large memory leak in NIO connector
   Additional patch (not important):
   http://svn.apache.org/viewvc?rev=1061397view=rev
-  +1: kkolinko, markt
+  +1: kkolinko, markt, fhanik
   -1:
 
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=50606
@@ -119,12 +119,12 @@ PATCHES PROPOSED TO BACKPORT:
   executable init-param. Provide support for explicit additional arguments
   for the executable. Those were broken when implementing fix for bug 49657.
   http://svn.apache.org/viewvc?rev=1061412view=rev
-  +1: kkolinko, markt
+  +1: kkolinko, markt, fhanik
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50620
   http://svn.apache.org/viewvc?rev=1061442view=rev
   http://svn.apache.org/viewvc?rev=1061446view=rev
   Plus copy o.a.tomcat.util.ExceptionUtils from trunk
-  +1: markt, kkolinko
+  +1: markt, kkolinko, fhanik
   -1:



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061519 - /tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Thu Jan 20 21:13:25 2011
New Revision: 1061519

URL: http://svn.apache.org/viewvc?rev=1061519view=rev
Log:
Changelog for recently applied fixes
(r1061401, r1061469, r1061470, r1061471)

Modified:
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1061519r1=1061518r2=1061519view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Thu Jan 20 
21:13:25 2011
@@ -66,7 +66,7 @@
   /fix
   fix
 bug50413/bug: Ensure 304s are not returned when using static files
-as error pages. (markt)
+as error pages. (markt/kkolinko)
   /fix
   fix
 Avoid unnecessary cast in StandardContext. (markt)
@@ -75,6 +75,11 @@
 bug50460/bug: Avoid a possible memory leak caused by using a cached
 exception instance. (kkolinko)
   /fix
+  fix
+bug50550/bug: When a new directory is created (e.g. via WebDAV)
+ensure that a subsequent request for that directory does not result in 
a
+404 response. (markt/kkolinko)
+  /fix
 /changelog
   /subsection
   subsection name=Coyote
@@ -108,6 +113,10 @@
 If maxInactiveInterval is negative, an access message is not sending. 
 (kfujino)
   /fix
+  fix
+bug50547/bug: Add time stamp for CHANGE_SESSION_ID message and 
+SESSION_EXPIRED message. (kfujino)
+  /fix
 /changelog
   /subsection
   subsection name=Webapps



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 49711] HttpServletRequest#getParts() does not work in a Filter

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=49711

--- Comment #8 from Christopher Schultz ch...@christopherschultz.net 
2011-01-20 16:20:54 EST ---
Working on a patch.

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061523 - /tomcat/tc5.5.x/trunk/STATUS.txt

[markt]

Author: markt
Date: Thu Jan 20 21:24:04 2011
New Revision: 1061523

URL: http://svn.apache.org/viewvc?rev=1061523view=rev
Log:
Vote

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1061523r1=1061522r2=1061523view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Jan 20 21:24:04 2011
@@ -77,5 +77,5 @@ PATCHES PROPOSED TO BACKPORT:
http://svn.apache.org/viewvc?rev=1061442view=rev
http://svn.apache.org/viewvc?rev=1061446view=rev
   (by markt)
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061524 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/coyote/http11/Http11NioProtocol.java

[kkolinko]

Author: kkolinko
Date: Thu Jan 20 21:28:11 2011
New Revision: 1061524

URL: http://svn.apache.org/viewvc?rev=1061524view=rev
Log:
Additional patch (not important) for r1061421
Use the new release(s,p) method added in r1061421

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1061524r1=1061523r2=1061524view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 20 21:28:11 2011
@@ -108,12 +108,6 @@ PATCHES PROPOSED TO BACKPORT:
  sufficient
   -1:
 
-* Fix very large memory leak in NIO connector
-  Additional patch (not important):
-  http://svn.apache.org/viewvc?rev=1061397view=rev
-  +1: kkolinko, markt, fhanik
-  -1:
-
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=50606
   Improve CGIServlet. Provide support for specifying empty value for the
   executable init-param. Provide support for explicit additional arguments

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1061524r1=1061523r2=1061524view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java 
Thu Jan 20 21:28:11 2011
@@ -773,9 +773,7 @@ public class Http11NioProtocol implement
 Http11NioProtocol.log.error
 (sm.getString(http11protocol.proto.error), e);
 }
-connections.remove(socket);
-processor.recycle();
-recycledProcessors.offer(processor);
+release(socket, processor);
 return SocketState.CLOSED;
 }
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061530 - /tomcat/trunk/webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Jan 20 21:34:19 2011
New Revision: 1061530

URL: http://svn.apache.org/viewvc?rev=1061530view=rev
Log:
Add missing entry

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1061530r1=1061529r2=1061530view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jan 20 21:34:19 2011
@@ -78,6 +78,11 @@
   fix
 bug50598/bug: Correct URL for Manager text interface. (markt)
   /fix
+  fix
+bug50620/bug: Stop exceptions that occur during
+codeSession.endAccess()/code from preventing the normal completion
+of codeRequest.recycle()/code. (markt)
+  /fix
 /changelog
   /subsection
   subsection name=Jasper



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061533 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/connector/LocalStrings.properties java/org/apache/catalina/connector/Request.java java/org/apache/tomcat/util/Ex

[markt]

Author: markt
Date: Thu Jan 20 21:36:06 2011
New Revision: 1061533

URL: http://svn.apache.org/viewvc?rev=1061533view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50620
Stop exceptions that occur during Session.endAccess() from preventing the 
normal completion of Request.recycle()

Added:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/ExceptionUtils.java
  - copied unchanged from r1061520, 
tomcat/trunk/java/org/apache/tomcat/util/ExceptionUtils.java
Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt

tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 20 21:36:06 2011
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77
 
0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901
 
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686
 
,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881

DO NOT REPLY [Bug 50620] Session related errors prevent clean recycle of Request and Response objects by CoyoteAdapter

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=50620

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

  Component|Catalina|Catalina
Version|unspecified |5.5.31
Product|Tomcat 6|Tomcat 5
   Target Milestone|default |---

--- Comment #2 from Mark Thomas ma...@apache.org 2011-01-20 16:36:31 EST ---
Fixed in 6.0.x and will be included in 6.0.31 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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1061536 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/servlets/CGIServlet.java webapps/docs/cgi-howto.xml webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Jan 20 21:44:08 2011
New Revision: 1061536

URL: http://svn.apache.org/viewvc?rev=1061536view=rev
Log:
Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=50606
Improve CGIServlet. Provide support for specifying empty value for the 
executable init-param. Provide support for explicit additional arguments for 
the executable. Those were broken when implementing fix for bug 49657. 
(kkolinko)

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/tc6.0.x/trunk/webapps/docs/cgi-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 20 21:44:08 2011
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77
 
0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901
 
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686
 
,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061442,1061446

DO NOT REPLY [Bug 50606] Error running CGI executable in Tomcat 6.0.30

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=50606

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED

--- Comment #3 from Mark Thomas ma...@apache.org 2011-01-20 16:44:44 EST ---
Fixed in 6.0.x and will be included in 6.0.31 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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Tomcat Wiki] Update of SupportAndTraining by developintelligence

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on Tomcat Wiki for change 
notification.

The SupportAndTraining page has been changed by developintelligence.
http://wiki.apache.org/tomcat/SupportAndTraining?action=diffrev1=28rev2=29

--

  
  
[[http://www.DevelopIntelligence.com/|{{http://www.developintelligence.com/img/logo.jpg}}]]
  
- !DevelopIntelligence offers highly-customized, project-centric learning 
solutions delivered on-site or on-line. Check out our  
[[http://www.developintelligence.com/catalog/open-source-server-training.php|Apache
 Tomcat Training]] course, or our wide variety of 
[[http://www.developintelligence.com/catalog/open-source-server-training.php|Open
 Source Training]] programs. 
+ !DevelopIntelligence offers highly-customized, project-centric learning 
solutions delivered on-site or on-line. Check out our  
[[http://http://www.developintelligence.com/catalog/open-source-training/server-administration/introduction-to-apache-tomcat|Apache
 Tomcat Training]] course, or our wide variety of 
[[http://www.developintelligence.com/catalog/apache-training|Apache Training]] 
and [[http://www.developintelligence.com/catalog/open-source-training|Open 
Source Training]] programs. 
  
  
  
[[http://www.springsource.com|{{http://www.springframework.org/sites/all/themes/zen/framework/logo.png|http://www.springsource.com}}]]

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Tomcat Wiki] Trivial Update of SupportAndTraining by developintelligence

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on Tomcat Wiki for change 
notification.

The SupportAndTraining page has been changed by developintelligence.
http://wiki.apache.org/tomcat/SupportAndTraining?action=diffrev1=29rev2=30

--

  
  
[[http://www.DevelopIntelligence.com/|{{http://www.developintelligence.com/img/logo.jpg}}]]
  
- !DevelopIntelligence offers highly-customized, project-centric learning 
solutions delivered on-site or on-line. Check out our  
[[http://http://www.developintelligence.com/catalog/open-source-training/server-administration/introduction-to-apache-tomcat|Apache
 Tomcat Training]] course, or our wide variety of 
[[http://www.developintelligence.com/catalog/apache-training|Apache Training]] 
and [[http://www.developintelligence.com/catalog/open-source-training|Open 
Source Training]] programs. 
+ !DevelopIntelligence offers highly-customized, project-centric learning 
solutions delivered on-site or on-line. Check out our  
[[http://www.developintelligence.com/catalog/open-source-training/server-administration/introduction-to-apache-tomcat|Apache
 Tomcat Training]] course, or our wide variety of 
[[http://www.developintelligence.com/catalog/apache-training|Apache Training]] 
and [[http://www.developintelligence.com/catalog/open-source-training|Open 
Source Training]] programs. 
  
  
  
[[http://www.springsource.com|{{http://www.springframework.org/sites/all/themes/zen/framework/logo.png|http://www.springsource.com}}]]

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 24174] [PACTH]/home/cvspublic/jakarta-tomcat-4.0/catalina/src/test/org/apache/naming/resources/BaseDirContextTestCase.java

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=24174

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Mark Thomas ma...@apache.org 2011-01-20 17:45:32 EST ---
Looking at the 5.5.x code base, this was fixed some time ago.

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 39740] semi-colon ; isn't allowed as a query argument separator

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=39740

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WONTFIX

--- Comment #3 from Mark Thomas ma...@apache.org 2011-01-20 17:49:28 EST ---
This recommendation will not be implemented.

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

bug in TC6 ContainerBase class?

[maxxe...@gmail.com]

In TC6 catalina core, ContainerBase class defines this field to stop
the background processor thread:

     private boolean threadDone = false;

Shouldn't it be a volatile? Because the background processor refers to
a classloader, could it prevent a (weak) classloader from being gc'ed?

-m

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

RE: bug in TC6 ContainerBase class?

[Caldarale, Charles R]

 From: maxxe...@gmail.com [mailto:maxxe...@gmail.com] 
 Subject: bug in TC6 ContainerBase class?

 In TC6 catalina core, ContainerBase class defines this field to stop
 the background processor thread:

      private boolean threadDone = false;

 Shouldn't it be a volatile?

In theory, the field should be marked volatile.  In practice, it won't make any 
difference, since the method calls will force a reload of the value upon return 
and the compiler must assume that the value could have changed.  The worst that 
could happen is that the thread never sees threadDone as true, and thus would 
never terminate - but, to my knowledge, there's never been any instances of 
that reported.

 - Chuck


THIS COMMUNICATION MAY CONTAIN CONFIDENTIAL AND/OR OTHERWISE PROPRIETARY 
MATERIAL and is thus for use only by the intended recipient. If you received 
this in error, please contact the sender and delete the e-mail and its 
attachments from all computers.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: bug in TC6 ContainerBase class?

[sebb]

On 21 January 2011 03:59, Caldarale, Charles R
chuck.caldar...@unisys.com wrote:
 From: maxxe...@gmail.com [mailto:maxxe...@gmail.com]
 Subject: bug in TC6 ContainerBase class?

 In TC6 catalina core, ContainerBase class defines this field to stop
 the background processor thread:

      private boolean threadDone = false;

 Shouldn't it be a volatile?

 In theory, the field should be marked volatile.  In practice, it won't make 
 any difference, since the method calls will force a reload of the value upon 
 return and the compiler must assume that the value could have changed.

Huh? What method calls will force a reload? Why must the compiler
assume it has changed? Surely that is what volatile is for?

threadStart() is OK, because it sets threadDone before starting the
thread, and a thread start acts as a memory barrier.

 The worst that could happen is that the thread never sees threadDone as true, 
 and thus would never terminate

Or it would take a while to be published to the other thread.

 but, to my knowledge, there's never been any instances of that reported.

But if it does happen, it will be a nuisance for all, so why not fix it now?

  - Chuck


 THIS COMMUNICATION MAY CONTAIN CONFIDENTIAL AND/OR OTHERWISE PROPRIETARY 
 MATERIAL and is thus for use only by the intended recipient. If you received 
 this in error, please contact the sender and delete the e-mail and its 
 attachments from all computers.


 -
 To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
 For additional commands, e-mail: dev-h...@tomcat.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

RE: bug in TC6 ContainerBase class?

[Caldarale, Charles R]

 From: sebb [mailto:seb...@gmail.com] 
 Subject: Re: bug in TC6 ContainerBase class?

 What method calls will force a reload? Why must the compiler
 assume it has changed?

Any other than Thread.sleep().  Again, we are discussing what happens in 
practice, not in theory.  Since the javac compiler does not, in this case, have 
knowledge of the internal operations of the called methods, it must 
pessimistically assume that synchronization may occur and fields have been 
updated.  (On the other hand, a JIT, with its runtime knowledge, could 
determine whether or not synchronization happens and optimize out the reload.  
But that would require either calls to very simplistic methods or a very deeply 
probing JIT.)  For methods that javac does have knowledge of (e.g., 
Thread.sleep(), as defined by 17.9 of the language spec, or non-overridable 
ones in the class), the compiler does not have to be pessimistic.

 Surely that is what volatile is for?

Volatile insures that ordering is observed in lieu of explicit synchronization.

 - Chuck


THIS COMMUNICATION MAY CONTAIN CONFIDENTIAL AND/OR OTHERWISE PROPRIETARY 
MATERIAL and is thus for use only by the intended recipient. If you received 
this in error, please contact the sender and delete the e-mail and its 
attachments from all computers.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

RE: bug in TC6 ContainerBase class?

[Caldarale, Charles R]

 From: sebb [mailto:seb...@gmail.com] 
 Subject: Re: bug in TC6 ContainerBase class?

  but, to my knowledge, there's never been any instances 
  of that reported.

 But if it does happen, it will be a nuisance for all, so 
 why not fix it now?

I have no objection to declaring the field to be volatile; my only problem is 
with the assumption that this could in any way affect observable behavior.

 - Chuck


THIS COMMUNICATION MAY CONTAIN CONFIDENTIAL AND/OR OTHERWISE PROPRIETARY 
MATERIAL and is thus for use only by the intended recipient. If you received 
this in error, please contact the sender and delete the e-mail and its 
attachments from all computers.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org