date:20111019

svn commit: r1185998 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ webapps/docs/

2011-10-19 Thread kkolinko

Author: kkolinko
Date: Wed Oct 19 07:15:30 2011
New Revision: 1185998

URL: http://svn.apache.org/viewvc?rev=1185998&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51872
Ensure access log always logs the correct remote IP.
Ensure requests with multiple errors do not result in multiple access log
entries.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1185998&r1=1185997&r2=1185998&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Oct 19 07:15:30 2011
@@ -64,14 +64,6 @@ PATCHES PROPOSED TO BACKPORT:
   - getStuckThreadIds() returns a list of ids. It might be useful to
 have a similar method that returns Thread.getName() names.
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51872
-  Ensure access log always logs the correct remote IP.
-  Ensure requests with multiple errors do not result in multiple access log
-  entries.
-  http://people.apache.org/~markt/patches/2011-09-27-bug51872-tc6.patch
-  +1: markt, kkolinko, rjung
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51905
   Fix infinite loop in AprEndpoint shutdown if acceptor unlock
   fails. Reduce timeout before forcefully closing the socket from 30s to 10s.

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1185998&r1=1185997&r2=1185998&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 
Wed Oct 19 07:15:30 2011
@@ -24,6 +24,7 @@ import java.io.UnsupportedEncodingExcept
 import org.apache.catalina.CometEvent;
 import org.apache.catalina.Context;
 import org.apache.catalina.Globals;
+import org.apache.catalina.Host;
 import org.apache.catalina.Wrapper;
 import org.apache.catalina.util.StringManager;
 import org.apache.catalina.util.ServerInfo;
@@ -32,6 +33,7 @@ import org.apache.coyote.ActionCode;
 import org.apache.coyote.Adapter;
 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;
 import org.apache.tomcat.util.buf.CharChunk;
@@ -340,10 +342,8 @@ public class CoyoteAdapter implements Ad
 
 Request request = (Request) req.getNote(ADAPTER_NOTES);
 Response response = (Response) res.getNote(ADAPTER_NOTES);
-boolean create = false;
 
 if (request == null) {
-create = true;
 // Create objects
 request = connector.createRequest();
 request.setCoyoteRequest(req);
@@ -363,10 +363,29 @@ public class CoyoteAdapter implements Ad
 (connector.getURIEncoding());
 }
 
-connector.getService().getContainer().logAccess(
-request, response, time, true);
-
-if (create) {
+try {
+// Log at the lowest level available. logAccess() will be
+// automatically called on parent containers.
+boolean logged = false;
+if (request.mappingData != null) {
+if (request.mappingData.context != null) {
+logged = true;
+((Context) request.mappingData.context).logAccess(
+request, response, time, true);
+} else if (request.mappingData.host != null) {
+logged = true;
+((Host) request.mappingData.host).logAccess(
+request, response, time, true);
+}
+}
+if (!logged) {
+connector.getService().getContainer().logAccess(
+request, response, time, true);
+}
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+log.warn(sm.getString("coyoteAdapter.accesslogFail"), t);
+} finally {
 request.recycle();
 response.recycle();
 }

Modified: tomcat/t

svn commit: r1185999 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

2011-10-19 Thread kkolinko

Author: kkolinko
Date: Wed Oct 19 07:17:27 2011
New Revision: 1185999

URL: http://svn.apache.org/viewvc?rev=1185999&view=rev
Log:
Add issue number and correct a typo.

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

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1185999&r1=1185998&r2=1185999&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Oct 19 07:17:27 2011
@@ -226,9 +226,10 @@
 restricted. (markt)
   
   
-Ensure that the access log always uses the correct value for the remote
-IP address associated with the request and that requests with multiple
-errors do not result in multiple entires in the access log. (markt)
+51872: Ensure that the access log always uses the correct
+value for the remote IP address associated with the request and that
+requests with multiple errors do not result in multiple entries in
+the access log. (markt)
   
 
   



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

DO NOT REPLY [Bug 51872] request.getRemoteAddr() sometimes returning IP address from the previous request

2011-10-19 Thread bugzilla

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

--- Comment #12 from Konstantin Kolinko  2011-10-19 
07:18:24 UTC ---
Fixed in 6.0 with r1185998 and will be in 6.0.34 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: r1186001 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/changelog.xml

2011-10-19 Thread kkolinko

Author: kkolinko
Date: Wed Oct 19 07:23:55 2011
New Revision: 1186001

URL: http://svn.apache.org/viewvc?rev=1186001&view=rev
Log:
Merged revision 1176799 from tomcat/trunk:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51905
Fix infinite loop in AprEndpoint shutdown if acceptor unlock
fails. Reduce timeout before forcefully closing the socket from 30s to 10s.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 07:23:55 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,943112,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,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575
 
,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1148216,1148471,1152601,1156519,1164567,1167394,1172233-1172234,1172236,11

svn commit: r1186005 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/tomcat/util/http/MimeHeaders.java webapps/docs/changelog.xml

2011-10-19 Thread kkolinko

Author: kkolinko
Date: Wed Oct 19 07:28:35 2011
New Revision: 1186005

URL: http://svn.apache.org/viewvc?rev=1186005&view=rev
Log:
Merged revisions r1177125, r1177245 from tomcat/trunk:
Improve MimeHeaders.toString() to deal with multiple headers having the same 
name.
This method is used only for debugging.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/MimeHeaders.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 07:28:35 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,943112,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,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575
 
,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1148216,1148471,1152601,1156519,1164567,1167394,1172233-1172234,1172236,1173614,1174353,1175158,1175190,1176799,1177850,1177862,1178228

svn commit: r1186011 - /tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml

2011-10-19 Thread kkolinko

Author: kkolinko
Date: Wed Oct 19 07:45:54 2011
New Revision: 1186011

URL: http://svn.apache.org/viewvc?rev=1186011&view=rev
Log:
Link to java.sql.DriverManager page, instead of the top frameset.

Modified:
tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml

Modified: tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1186011&r1=1186010&r2=1186011&view=diff
==
--- tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Wed Oct 19 
07:45:54 2011
@@ -69,7 +69,7 @@ the section about Automatic Application 
 
 
 java.sql.DriverManager supports the
-http://download.oracle.com/javase/6/docs/api/index.html";>service
+http://download.oracle.com/javase/6/docs/api/index.html?java/sql/DriverManager.html";>service
 provider mechanism. However, the implementation is fundamentally broken in
 all Java versions for a servlet container environment.
 java.sql.DriverManager will only scan the first web application to



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

svn commit: r1186014 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java webapps/docs/changelog.xml webapps/docs/config/listeners.xml webapps/d

2011-10-19 Thread kkolinko

Author: kkolinko
Date: Wed Oct 19 07:47:53 2011
New Revision: 1186014

URL: http://svn.apache.org/viewvc?rev=1186014&view=rev
Log:
Merged revisions r1156171, r1184917, r1184919, r1185200, r1186011 from 
tomcat/trunk:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51640
Improve memory leak protection for DriverManager

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt

tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/listeners.xml
tomcat/tc6.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 07:47:53 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,943112,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,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575
 
,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,

DO NOT REPLY [Bug 51640] clearReferencesJdbc seems to be causing leaks with com.oracle.ojdbc5 driver

2011-10-19 Thread bugzilla

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

--- Comment #3 from Konstantin Kolinko  2011-10-19 
08:18:25 UTC ---
(In reply to comment #1)
> This has been fixed in trunk and 7.0.x and will be included in 7.0.21 onwards.

Backported to 6.0 in r1186014 and will be in 6.0.34 onwards.


Documentation regarding SQL DriverManager class has been added to the "JDBC
DataSources" page in documentation (jndi-datasource-examples-howto.html).

-- 
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: r1186042 - /tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 09:16:26 2011
New Revision: 1186042

URL: http://svn.apache.org/viewvc?rev=1186042&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52042
Correct threading issue in annotation caching that could lead to an
NPE if multiple threads were processing the same class hierarchy for
annotations

Modified:
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java

Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1186042&r1=1186041&r2=1186042&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Wed 
Oct 19 09:16:26 2011
@@ -423,11 +423,6 @@ public class DefaultInstanceManager impl
 new WeakReference>(
 annotations));
 }
-} else {
-// If the annotations for this class have been cached, the
-// annotations for all the super classes will have been cachced
-// as well
-break;
 }
 clazz = clazz.getSuperclass();
 }



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

svn commit: r1186043 - /tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 09:17:05 2011
New Revision: 1186043

URL: http://svn.apache.org/viewvc?rev=1186043&view=rev
Log:
Fix threading issue when setting accessibility

Modified:
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java

Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1186043&r1=1186042&r2=1186043&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Wed 
Oct 19 09:17:05 2011
@@ -186,8 +186,8 @@ public class DefaultInstanceManager impl
 for (AnnotationCacheEntry entry : annotations) {
 if (entry.getType() == AnnotationCacheEntryType.POST_CONSTRUCT) {
 Method postConstruct = (Method) entry.getAccessibleObject();
-boolean accessibility = postConstruct.isAccessible();
 synchronized (postConstruct) {
+boolean accessibility = postConstruct.isAccessible();
 postConstruct.setAccessible(true);
 postConstruct.invoke(instance);
 postConstruct.setAccessible(accessibility);
@@ -230,8 +230,8 @@ public class DefaultInstanceManager impl
 for (AnnotationCacheEntry entry : annotations) {
 if (entry.getType() == AnnotationCacheEntryType.PRE_DESTROY) {
 Method preDestroy = (Method) entry.getAccessibleObject();
-boolean accessibility = preDestroy.isAccessible();
 synchronized (preDestroy) {
+boolean accessibility = preDestroy.isAccessible();
 preDestroy.setAccessible(true);
 preDestroy.invoke(instance);
 preDestroy.setAccessible(accessibility);
@@ -576,8 +576,8 @@ public class DefaultInstanceManager impl
 context.lookup(clazz.getName() + "/" + field.getName());
 }
 
-accessibility = field.isAccessible();
 synchronized (field) {
+accessibility = field.isAccessible();
 field.setAccessible(true);
 field.set(instance, lookedupResource);
 field.setAccessible(accessibility);
@@ -620,8 +620,8 @@ public class DefaultInstanceManager impl
 clazz.getName() + "/" + getName(method));
 }
 
-accessibility = method.isAccessible();
 synchronized (method) {
+accessibility = method.isAccessible();
 method.setAccessible(true);
 method.invoke(instance, lookedupResource);
 method.setAccessible(accessibility);



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

svn commit: r1186044 - /tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 09:17:41 2011
New Revision: 1186044

URL: http://svn.apache.org/viewvc?rev=1186044&view=rev
Log:
Prevent possible loss of cache entries due to GC by using strong rather
than weak references for the cache entries. This means removing the use
of Field and Method from the cache entry as they hold a strong reference
to Class which would break the cache since Class is the key for the
WeakHashMap that implements the cache.

Modified:
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java

Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1186044&r1=1186043&r2=1186044&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Wed 
Oct 19 09:17:41 2011
@@ -21,8 +21,6 @@ package org.apache.catalina.core;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.ref.WeakReference;
-import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -71,8 +69,8 @@ public class DefaultInstanceManager impl
 private final Properties restrictedFilters = new Properties();
 private final Properties restrictedListeners = new Properties();
 private final Properties restrictedServlets = new Properties();
-private final Map,WeakReference>> 
annotationCache =
-new WeakHashMap, WeakReference>>();
+private final Map,List> annotationCache =
+new WeakHashMap, List>();
 
 public DefaultInstanceManager(Context context, Map> injectionMap, org.apache.catalina.Context catalinaContext, ClassLoader 
containerClassLoader) {
 classLoader = catalinaContext.getLoader().getClassLoader();
@@ -181,11 +179,11 @@ public class DefaultInstanceManager impl
 // method is invoked
 List annotations;
 synchronized (annotationCache) {
-annotations = annotationCache.get(clazz).get();
+annotations = annotationCache.get(clazz);
 }
 for (AnnotationCacheEntry entry : annotations) {
 if (entry.getType() == AnnotationCacheEntryType.POST_CONSTRUCT) {
-Method postConstruct = (Method) entry.getAccessibleObject();
+Method postConstruct = getMethod(clazz, entry);
 synchronized (postConstruct) {
 boolean accessibility = postConstruct.isAccessible();
 postConstruct.setAccessible(true);
@@ -217,11 +215,7 @@ public class DefaultInstanceManager impl
 // method is invoked
 List annotations = null;
 synchronized (annotationCache) {
-WeakReference> ref =
-annotationCache.get(clazz);
-if (ref != null) {
-annotations = ref.get();
-}
+annotations = annotationCache.get(clazz);
 }
 if (annotations == null) {
 // instance not created through the instance manager
@@ -229,7 +223,7 @@ public class DefaultInstanceManager impl
 }
 for (AnnotationCacheEntry entry : annotations) {
 if (entry.getType() == AnnotationCacheEntryType.PRE_DESTROY) {
-Method preDestroy = (Method) entry.getAccessibleObject();
+Method preDestroy = getMethod(clazz, entry);
 synchronized (preDestroy) {
 boolean accessibility = preDestroy.isAccessible();
 preDestroy.setAccessible(true);
@@ -260,11 +254,7 @@ public class DefaultInstanceManager impl
 while (clazz != null) {
 List annotations = null;
 synchronized (annotationCache) {
-WeakReference> ref =
-annotationCache.get(clazz);
-if (ref != null) {
-annotations = ref.get();
-}
+annotations = annotationCache.get(clazz);
 }
 if (annotations == null) {
 annotations = new ArrayList();
@@ -287,36 +277,37 @@ public class DefaultInstanceManager impl
 }
 for (Field field : fields) {
 if (injections != null && 
injections.containsKey(field.getName())) {
-annotations.add(new AnnotationCacheEntry(field,
+annotations.add(new AnnotationCacheEntry(
+field.getName(), null,
 injections.get(field.getName()),
 AnnotationCacheEntryType.FIELD));
 } else if (field.isAnnotationPresent(Resource.class)) {

svn commit: r1186045 - /tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 09:18:18 2011
New Revision: 1186045

URL: http://svn.apache.org/viewvc?rev=1186045&view=rev
Log:
Use correct attribute for method/field name

Modified:
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java

Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1186045&r1=1186044&r2=1186045&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Wed 
Oct 19 09:18:18 2011
@@ -673,7 +673,7 @@ public class DefaultInstanceManager impl
 } else {
 try {
 result = clazz.getDeclaredMethod(
-entry.getName(), entry.getParamTypes());
+entry.getAccessibleObjectName(), 
entry.getParamTypes());
 } catch (NoSuchMethodException e) {
 // Should never happen. On that basis don't log it.
 }
@@ -702,7 +702,8 @@ public class DefaultInstanceManager impl
 });
 } else {
 try {
-result = clazz.getDeclaredField(entry.getName());
+result = clazz.getDeclaredField(
+entry.getAccessibleObjectName());
 } catch (NoSuchFieldException e) {
 // Should never happen. On that basis don't log it.
 }



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

svn commit: r1186046 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/DefaultInstanceManager.java webapps/docs/changelog.xml

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 09:20:50 2011
New Revision: 1186046

URL: http://svn.apache.org/viewvc?rev=1186046&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52042
Correct threading issue in annotation caching that could lead to an
NPE if multiple threads were processing the same class hierarchy for
annotations

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 09:20:50 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256
 
,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256
 
,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1186042

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1186046&r1=1186045&r2=1186046&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 
Wed Oct 19 09:20:50 2011
@@ -421,11 +421,6 @@ public class DefaultInstanceManager impl
 new WeakReference>(
 annotations));
 }
-} else {
-// If the annotations for this class have been cached, the
-// annotations for all the super classes will have be

svn commit: r1186050 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/DefaultInstanceManager.java webapps/docs/changelog.xml

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 09:31:30 2011
New Revision: 1186050

URL: http://svn.apache.org/viewvc?rev=1186050&view=rev
Log:
Correct additional threading and premature clearance issues with the annotation 
cache.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 09:31:30 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256
 
,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1186042
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241
 
,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1186042-1186045

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1186050&r1=1186049&r2=1186050&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 
Wed Oct 19 09:31:30 2011
@@ -21,8 +21,6 @@ package org.apache.catalina.core;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.ref.WeakReference;
-import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -71,8 +69,8 @@ public class DefaultInstanceManager impl
 private Properties restrictedFilters = new Properties();
 private P

DO NOT REPLY [Bug 52042] Possible NullPointerException in DefaultInstanceManager#processAnnotations

2011-10-19 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #5 from Mark Thomas  2011-10-19 09:32:43 UTC ---
Thanks for the report. I have fixed this and the additional errors I discovered
while investigating this issue. The fix has been applied to trunk (8.0.x) and
7.0.x and will be included in 7.0.23 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: r1186054 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/util/FastRemovalDequeue.java test/org/apache/jasper/util/ test/org/apache/jasper/util/TestFastRemovalDequeue.java webapps/doc

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 09:43:22 2011
New Revision: 1186054

URL: http://svn.apache.org/viewvc?rev=1186054&view=rev
Log:
Correct possible (but very small) memory leak when using maxLoadedJsps to limit 
the number of JSPs loaded at any one time.

Added:
tomcat/tc7.0.x/trunk/test/org/apache/jasper/util/
  - copied from r1185758, tomcat/trunk/test/org/apache/jasper/util/
tomcat/tc7.0.x/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java
  - copied unchanged from r1185758, 
tomcat/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 09:43:22 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241
 
,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1186042-1186045
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241
 
,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186042-1186045

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java?rev=1186054&r1=1186053&r2=1186054&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java 
Wed Oct 19 09:43:22 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2

svn commit: r1186055 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 09:43:36 2011
New Revision: 1186055

URL: http://svn.apache.org/viewvc?rev=1186055&view=rev
Log:
Code clean-up. No functional change.

Modified:

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1186055&r1=1186054&r2=1186055&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 
Wed Oct 19 09:43:36 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -66,9 +66,9 @@ public class DefaultInstanceManager impl
 protected final ClassLoader containerClassLoader;
 protected boolean privileged;
 protected boolean ignoreAnnotations;
-private Properties restrictedFilters = new Properties();
-private Properties restrictedListeners = new Properties();
-private Properties restrictedServlets = new Properties();
+private final Properties restrictedFilters = new Properties();
+private final Properties restrictedListeners = new Properties();
+private final Properties restrictedServlets = new Properties();
 private final Map,List> annotationCache =
 new WeakHashMap, List>();
 
@@ -132,7 +132,7 @@ public class DefaultInstanceManager impl
 }
 
 @Override
-public void newInstance(Object o) 
+public void newInstance(Object o)
 throws IllegalAccessException, InvocationTargetException, 
NamingException {
 newInstance(o, o.getClass());
 }
@@ -258,7 +258,7 @@ public class DefaultInstanceManager impl
 }
 if (annotations == null) {
 annotations = new ArrayList();
-
+
 if (context != null) {
 // Initialize fields annotations for resource injection if
 // JNDI is enabled
@@ -312,7 +312,7 @@ public class DefaultInstanceManager impl
 }
 }
 }
-
+
 // Initialize methods annotations
 Method[] methods = null;
 if (Globals.IS_SECURITY_ENABLED) {
@@ -396,7 +396,7 @@ public class DefaultInstanceManager impl
 }
 postConstruct = method;
 }
-
+
 if (method.isAnnotationPresent(PreDestroy.class)) {
 if ((preDestroy != null ||
 method.getParameterTypes().length != 0) ||
@@ -422,7 +422,7 @@ public class DefaultInstanceManager impl
 AnnotationCacheEntryType.PRE_DESTROY));
 }
 if (annotations.size() == 0) {
-// Use common empty list to save memory 
+// Use common empty list to save memory
 annotations = Collections.emptyList();
 }
 synchronized (annotationCache) {
@@ -453,7 +453,7 @@ public class DefaultInstanceManager impl
 }
 
 Class clazz = instance.getClass();
-
+
 while (clazz != null) {
 List annotations;
 synchronized (annotationCache) {
@@ -526,7 +526,9 @@ public class DefaultInstanceManager impl
 }
 
 private void checkAccess(Class clazz) {
-if (privileged) return;
+if (privileged) {
+return;
+}
 if (Filter.class.isAssignableFrom(clazz)) {
 checkAccess(clazz, restrictedFilters);
 } else if (Servlet.class.isAssignableFrom(clazz)) {
@@ -640,7 +642,7 @@ public class DefaultInstanceManager impl
 
 return name.toString();
 }
-
+
 private static String normalize(String jndiName){
 if(jndiName != null && jndiName.startsWith("java:comp/env/")){
 return jndiName.substring(14);



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

svn commit: r1186058 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/Response.java test/org/apache/catalina/connector/TestResponsePerformance.java

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 09:47:40 2011
New Revision: 1186058

URL: http://svn.apache.org/viewvc?rev=1186058&view=rev
Log:
Sync with trunk. Add performance unit test.

Added:

tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java
  - copied unchanged from r1180891, 
tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 09:47:40 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241
 
,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186042-1186045
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241
 
,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186042-1186045

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java?rev=1186058&r1=1186057&r2=1186058&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java Wed 
Oct 19 09:47:40 2011
@@ -1584,7 +1584,7 @@ public class Response
  * @exception IllegalArgumentException if a MalformedURLException is
  *  thrown when converting the relative URL to an absolute one
  */
-private String toAbsolute(String location) {
+protected String toAbsolute(String location) {
 
 if (lo

svn commit: r1186063 - in /tomcat/tc7.0.x/trunk/java/org/apache/catalina: core/StandardHost.java filters/RemoteAddrFilter.java

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 09:51:42 2011
New Revision: 1186063

URL: http://svn.apache.org/viewvc?rev=1186063&view=rev
Log:
Sync with trunk.
Whitespace only.

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java?rev=1186063&r1=1186062&r2=1186063&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java Wed 
Oct 19 09:51:42 2011
@@ -186,11 +186,10 @@ public class StandardHost extends Contai
  */
 @Override
 public String getAppBase() {
-
 return (this.appBase);
-
 }
 
+
 /**
  * Return the XML root for this Host.  This can be an absolute
  * pathname, a relative pathname, or a URL.
@@ -203,6 +202,7 @@ public class StandardHost extends Contai
 
 }
 
+
 /**
  * Set the application root for this Host.  This can be an absolute
  * pathname, a relative pathname, or a URL.
@@ -218,6 +218,7 @@ public class StandardHost extends Contai
 
 }
 
+
 /**
  * Set the Xml root for this Host.  This can be an absolute
  * pathname, a relative pathname, or a URL.
@@ -234,6 +235,7 @@ public class StandardHost extends Contai
 
 }
 
+
 /**
  * Returns true if the Host will attempt to create directories for appBase 
and xmlBase
  * unless they already exist.

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java?rev=1186063&r1=1186062&r2=1186063&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java 
Wed Oct 19 09:51:42 2011
@@ -97,5 +97,4 @@ public final class RemoteAddrFilter
 protected Log getLogger() {
 return log;
 }
-
 }



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

DO NOT REPLY [Bug 52056] New: Wrong HTTP status 200 in log instead of 500/503

2011-10-19 Thread bugzilla

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

 Bug #: 52056
   Summary: Wrong HTTP status 200 in log instead of 500/503
   Product: Tomcat Connectors
   Version: 1.2.32
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: mod_jk
AssignedTo: dev@tomcat.apache.org
ReportedBy: aven...@dmz.org.ua
Classification: Unclassified


Created attachment 27818
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=27818
default value for request_rec.status

In case JkLogFormat contains "%s" (Request HTTP status) placeholder - it is not
always shows correct codes.
If there are no workers available - mod_jk records 200 (HTTP_OK) in logs, while
httpd records and shows 503 error:

DO NOT REPLY [Bug 52056] Wrong HTTP status 200 in log instead of 500/503

2011-10-19 Thread bugzilla

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

--- Comment #1 from Dmitry Zamaruev  2011-10-19 10:07:32 
UTC ---
With patch applied I have more correct values in logs:

DO NOT REPLY [Bug 52056] Wrong HTTP status 200 in log instead of 500/503

2011-10-19 Thread bugzilla

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

--- Comment #2 from Konstantin Kolinko  2011-10-19 
10:15:39 UTC ---
1. Versions of everything = ?
There are various fixes in various Tomcat versions and the behaviour may be
different.

2. What exactly are those files, "access.log" and "mod_jk.log"?
Or better provide exact steps & configuration to reproduce this.

-- 
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: r1186071 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ha/session/SerializablePrincipal.java java/org/apache/catalina/realm/GenericPrincipal.java

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 10:21:28 2011
New Revision: 1186071

URL: http://svn.apache.org/viewvc?rev=1186071&view=rev
Log:
Do not sort lists that have only one element (kkolinko)

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 10:21:28 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241
 
,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186042-1186045
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241
 
,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1180261,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186042-1186045

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java?rev=1186071&r1=1186070&r2=1186071&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java
 Wed Oct 19 10:21:28 2011
@@ -108,7 +108,7 @@ public class SerializablePrincipal  impl
 if (roles != null) {
 this.roles = new String[roles.size()];
 this.roles = roles.toArray(this.roles);
-if (this.roles.length > 0)
+if (this.roles.length > 1)
 Arrays.sort(this.roles);
 }
 if

svn commit: r1186074 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 10:31:41 2011
New Revision: 1186074

URL: http://svn.apache.org/viewvc?rev=1186074&view=rev
Log:
Fix possible NPE

Modified:

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java?rev=1186074&r1=1186073&r2=1186074&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
 Wed Oct 19 10:31:41 2011
@@ -283,7 +283,7 @@ public class NioReceiver extends Receive
 // get an iterator over the set of selected keys
 Iterator it = 
(selector!=null)?selector.selectedKeys().iterator():null;
 // look at each key in the selected set
-while (selector!=null && it.hasNext()) {
+while (it!=null && it.hasNext()) {
 SelectionKey key = it.next();
 // Is a new connection coming in?
 if (key.isAcceptable()) {



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

svn commit: r1186076 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/JspC.java

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 10:34:26 2011
New Revision: 1186076

URL: http://svn.apache.org/viewvc?rev=1186076&view=rev
Log:
Resolve "Redundant null check: the variable cannot be null at this location" 
warning.
The JspC constructor cannot throw a JasperException. (kkolinko)

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 10:34:26 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241
 
,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1180261,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186042-1186045
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241
 
,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1180261,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186042-1186045

Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java?rev=1186076&r1=1186075&r2=1186076&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java Wed Oct 19 10:34:26 
2011
@@ -250,9 +250,8 @@ public class JspC implements Options {
 if (arg.length == 0) {
 System.out.println(Localizer.getMessage("jspc.usage"));
 } else {
-JspC jspc = null;
+JspC jspc = new JspC();
 try {
-jspc = new JspC();
 jspc.setArgs(arg);
 if (jspc.helpNeeded) {
 System.out.println(Localizer.getMessage("jspc.usage"));
@@ -261,7

svn commit: r1186078 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/DefaultServerSocketFactory.java

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 10:37:01 2011
New Revision: 1186078

URL: http://svn.apache.org/viewvc?rev=1186078&view=rev
Log:
Remove unused code

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/DefaultServerSocketFactory.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 10:37:01 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241
 
,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1180261,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186042-1186045
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1180261,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186042-1186045

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/DefaultServerSocketFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/DefaultServerSocketFactory.java?rev=1186078&r1=1186077&r2=1186078&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/DefaultServerSocketFactory.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/DefaultServerSocketFactory.java
 Wed Oct 19 10:37:01 2011
@@ -31,10 +31,11 @@ import java.net.Socket;
  */
 public class DefaultServerSocketFactory implements ServerSocketFactory {
 
-private AbstractEndpoint endpoint;
-
+/**
+ * 
+ * @param endpoint  Unused in this implementation.
+ */
 public DefaultServerSocketFactory(AbstractEndpoint endpoint) {
-this.endpoint = endpoint;
 }
 
 @Override



---

svn commit: r1186079 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/IntrospectionUtils.java

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 10:37:58 2011
New Revision: 1186079

URL: http://svn.apache.org/viewvc?rev=1186079&view=rev
Log:
Resolve a warning about unboxing operation. Perform unboxing explicitly. 
(kkolinko)

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 10:37:58 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1180261,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186042-1186045
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186042-1186045

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java?rev=1186079&r1=1186078&r2=1186079&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java 
Wed Oct 19 10:37:58 2011
@@ -359,7 +359,8 @@ public final class IntrospectionUtils {
 params[1] = value;
 if (setPropertyMethodBool != null) {
 try {
-return (Boolean) setPropertyMethodBool.invoke(o, 
params);
+return ((Boolean) setPropertyMethodBool.invoke(o,
+params)).booleanValue();

DO NOT REPLY [Bug 52056] Wrong HTTP status 200 in log instead of 500/503

2011-10-19 Thread bugzilla

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

--- Comment #3 from Dmitry Zamaruev  2011-10-19 10:38:00 
UTC ---
Created attachment 27819
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=27819
mod_jk configuration

-- 
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 52056] Wrong HTTP status 200 in log instead of 500/503

2011-10-19 Thread bugzilla

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

--- Comment #4 from Dmitry Zamaruev  2011-10-19 10:38:33 
UTC ---
Created attachment 27820
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=27820
mod_jk workers properties

Sorry, forget about versions:
mod_jk - 1.2.32 (latest) 
httpd - 2.2.21

access.log - default apache access log, configured with:
CustomLog /var/log/httpd/access.log combined

mod_jk.log - default mod_jk log file:
JkLogFile /var/log/httpd/mod_jk.log
JkRequestLogFormat "%T %R %V \"%r\" %s"

Configuration is simple - any unreachable worker will work. See attachments for
example configuration.

-- 
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 52056] Wrong HTTP status 200 in log instead of 500/503

2011-10-19 Thread bugzilla

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

Dmitry Zamaruev  changed:

   What|Removed |Added

  Attachment #27820|application/octet-stream|text/plain
  mime type||

-- 
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 52056] Wrong HTTP status 200 in log instead of 500/503

2011-10-19 Thread bugzilla

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

Dmitry Zamaruev  changed:

   What|Removed |Added

  Attachment #27819|application/octet-stream|text/plain
  mime type||

-- 
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: r1186080 - /tomcat/tc7.0.x/trunk/modules/

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 10:40:06 2011
New Revision: 1186080

URL: http://svn.apache.org/viewvc?rev=1186080&view=rev
Log:
Update jdbc-pool to latest

Modified:
tomcat/tc7.0.x/trunk/modules/   (props changed)

Propchange: tomcat/tc7.0.x/trunk/modules/
--
--- svn:externals (original)
+++ svn:externals Wed Oct 19 10:40:06 2011
@@ -1 +1 @@
-^/tomcat/trunk/modules/jdbc-pool@1170485 jdbc-pool
+^/tomcat/trunk/modules/jdbc-pool@1186079 jdbc-pool



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

DO NOT REPLY [Bug 52056] Wrong HTTP status 200 in log instead of 500/503

2011-10-19 Thread bugzilla

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

Dmitry Zamaruev  changed:

   What|Removed |Added

   Severity|normal  |minor

-- 
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: r1186082 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 10:44:14 2011
New Revision: 1186082

URL: http://svn.apache.org/viewvc?rev=1186082&view=rev
Log:
Focus DIGEST auth performance test on authentication process.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 10:44:14 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186042-1186045
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186042-1186045

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java?rev=1186082&r1=1186081&r2=1186082&view=diff
==
--- 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
 Wed Oct 19 10:44:14 2011
@@ -18,52 +18,51 @@ package org.apache.catalina.authenticato
 
 import java.io.IOException;
 import java.security.MessageDigest;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.security.NoSuc

svn commit: r1186104 - /tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml

2011-10-19 Thread kkolinko

Author: kkolinko
Date: Wed Oct 19 11:20:08 2011
New Revision: 1186104

URL: http://svn.apache.org/viewvc?rev=1186104&view=rev
Log:
Rewrote the DriverManager section in jndi-datasource-examples-howto.xml.
The point of view is that driverManagerProtection feature in leak prevention
listener is enabled by default. The old warnings about how the things may break
thus have much less value.

Modified:
tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml

Modified: tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1186104&r1=1186103&r2=1186104&view=diff
==
--- tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Wed Oct 19 
11:20:08 2011
@@ -70,43 +70,39 @@ the section about Automatic Application 
 
 java.sql.DriverManager supports the
 http://download.oracle.com/javase/6/docs/api/index.html?java/sql/DriverManager.html";>service
-provider mechanism. However, the implementation is fundamentally broken in
-all Java versions for a servlet container environment.
-java.sql.DriverManager will only scan the first web application to
-use it for JDBC drivers using the service provider mechanism. Any JDBC drivers
-present in the web application or any parent class loader will be discovered
-correctly (including those in $CATALINA_BASE/lib) but no further scans will be
-performed for any other web applications. For example, if there are two web
-applications each using a different JDBC driver packaged in WEB-INF/lib, the
-service provider mechanism will only work for the first web application to use
-DriverManager. The other web application will be required to register the 
Driver
-manually. Given that web application start order is undefined, the service
-provider mechanism can not be relied upon for JDBC Driver implementations
-packaged in WEB-INF/lib.
-
-
-The java.sql.DriverManager is also a frequent source of memory
-leaks. Any Drivers registered with the DriverManager by a web application must
-be deregistered when the web application stops. If the service provider
-mechanism registers a JDBC driver, it will never deregister it. Tomcat will
-attempt to automatically deregister and registered JDBC drivers discovered
-when a web application stops. However, it is expected that applications do this
-for themselves via a ServletContextListener.
-
-
-There have been reports that the memory leak prevention code that 
deregisters
-JDBC drivers can, in unusual circumstances, trigger a memory leak rather than
-fix it. To prevent this, the JRE Memory Leak
-Prevention Listener includes protection for the DriverManager. This
-protection is enabled by default. Note that a side-effect of enabling this
-protection is that while any JDBC Driver implementations packaged with the JVM
-or located in $CATALINA_BASE/lib will be correctly discovered by the service
-provider mechanism, JDBC Driver implementations packaged in web applications
-will not be discovered. It is therefore necessary for applications to manually
-register (and deregister) and JDBC drivers they require that are packaged in 
the
-WEB-INF/lib directory. Given the known issues with the service provider
-implementation for DriverManager, most web applications will probably be doing
-this already.
+provider mechanism. This feature is that all the available JDBC drivers
+that announce themselves by providing a 
META-INF/services/java.sql.Driver
+file are automatically discovered, loaded and registered,
+relieving you from the need to load the database driver explicitly before
+you create a JDBC connection.
+However, the implementation is fundamentally broken in all Java versions for
+a servlet container environment. The problem is that
+java.sql.DriverManager will scan for the drivers only once.
+
+The JRE Memory Leak Prevention Listener
+that is included with Apache Tomcat solves this by triggering the drivers scan
+during Tomcat startup. This is enabled by default. It means that only
+libraries visible to the listener such as the ones in
+$CATALINA_BASE/lib will be scanned for database drivers.
+If you are considering disabling this feature, note that
+the scan would be triggered by the first web application that is
+using JDBC, leading to failures when this web application is reloaded
+and for other web applications that rely on this feature.
+
+
+Thus, the web applications that have database drivers in their
+WEB-INF/lib directory cannot rely on the service provider
+mechanism and should register the drivers explicitly.
+
+The list of drivers in java.sql.DriverManager is also
+a known source of memory leaks. Any Drivers registered
+by a web application must be deregistered when the web application stops.
+Tomcat will attempt to automatically discover and deregister any
+JDBC drivers loaded by

svn commit: r1186114 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/jndi-datasource-examples-howto.xml

2011-10-19 Thread kkolinko

Author: kkolinko
Date: Wed Oct 19 11:40:40 2011
New Revision: 1186114

URL: http://svn.apache.org/viewvc?rev=1186114&view=rev
Log:
Merged revisions r1186011, r1186104 from tomcat/trunk:
Rewrote the DriverManager section in jndi-datasource-examples-howto.xml.
The point of view is that driverManagerProtection feature in leak prevention
listener is enabled by default. The old warnings about how the things may break
thus have much less value.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:40:40 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186042-1186045
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104

Modified: tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1186114&r1=1186113&r2=1186114&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml 
(original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml Wed 
Oct 19 11:40:40 2011
@@ -69,44 +69,40 @@ the section about Automatic Application 
 
 
 java.sql.DriverManager supports the
-http://download.oracle.com/javase/6/docs/api/ind

svn commit: r1186115 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/jndi-datasource-examples-howto.xml

2011-10-19 Thread kkolinko

Author: kkolinko
Date: Wed Oct 19 11:42:03 2011
New Revision: 1186115

URL: http://svn.apache.org/viewvc?rev=1186115&view=rev
Log:
CTR: docs
Merged revision r1186104 from tomcat/trunk:
Rewrote the DriverManager section in jndi-datasource-examples-howto.xml.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:42:03 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,943112,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,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575
 
,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1148216,1148471,1152601,1156171,1156519,1164567,1167394,1172233-1172234,1172236,1173614,1174353,1175158,1175190,1176799,1177125,1177245,1177850,1177862,1178228,1178233,1184917,1184919,1185200,1185588,1186011
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,66623

svn commit: r1186123 - /tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml

2011-10-19 Thread kkolinko

Author: kkolinko
Date: Wed Oct 19 11:50:19 2011
New Revision: 1186123

URL: http://svn.apache.org/viewvc?rev=1186123&view=rev
Log:
Correct the markup. s/db/database/

Modified:
tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml

Modified: tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1186123&r1=1186122&r2=1186123&view=diff
==
--- tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Wed Oct 19 
11:50:19 2011
@@ -120,10 +120,12 @@ DBCP documentation for a complete li
 
 DBCP uses the Commons Database Connection Pool. It relies on
 number of Commons components:
+
 
 Commons DBCP
 Commons Pool
 
+
 These libraries are located in a single JAR at 
 $CATALINA_HOME/lib/tomcat-dbcp.jar. However,
 only the classes needed for connection pooling have been included, and the
@@ -132,45 +134,49 @@ packages have been renamed to avoid inte
 
 
 
-
+
 
 
 A database connection pool creates and manages a pool of connections
 to a database. Recycling and reusing already existing connections
-to a dB is more efficient than opening a new connection.
+to a database is more efficient than opening a new connection.
 
 
 
 There is one problem with connection pooling.  A web application has
 to explicitly close ResultSet's, Statement's, and Connection's.
 Failure of a web application to close these resources can result in
-them never being available again for reuse, a db connection pool "leak".
-This can eventually result in your web application db connections failing
+them never being available again for reuse, a database connection pool "leak".
+This can eventually result in your web application database connections failing
 if there are no more available connections.
 
 
-There is a solution to this problem.  The Jakarta-Commons DBCP can be
+There is a solution to this problem.  The Apache Commons DBCP can be
 configured to track and recover these abandoned dB connections.  Not
 only can it recover them, but also generate a stack trace for the code
 which opened these resources and never closed them.
 
 
-To configure a DBCP DataSource so that abandoned dB connections are
+To configure a DBCP DataSource so that abandoned database connections are
 removed and recycled add the following attribute to the
 Resource configuration for your DBCP DataSource:
-
-removeAbandoned="true"
-
-When available db connections run low DBCP will recover and recycle
-any abandoned dB connections it finds. The default is false.
+
+
+removeAbandoned="true"
+
+
+When available database connections run low DBCP will recover and recycle
+any abandoned database connections it finds. The default is false.
 
 
 
 Use the removeAbandonedTimeout attribute to set the number
 of seconds a dB connection has been idle before it is considered abandoned.
-
-removeAbandonedTimeout="60"
-
+
+
+removeAbandonedTimeout="60"
+
+
 The default timeout for removing abandoned connections is 300 seconds.
 
 
@@ -178,9 +184,9 @@ The default timeout for removing abandon
 The logAbandoned attribute can be set to true
 if you want DBCP to log a stack trace of the code which abandoned the
 dB connection resources.
-
-logAbandoned="true"
-
+
+logAbandoned="true"
+
 The default is false.
 
 
@@ -189,13 +195,14 @@ The default is false.
 
 
 0. Introduction
-Versions of http://www.mysql.com/products/mysql/index.html";>MySQL and JDBC 
drivers that have been reported to work:
+Versions of http://www.mysql.com/products/mysql/index.html";>MySQL and JDBC
+drivers that have been reported to work:
+
 
 MySQL 3.23.47, MySQL 3.23.47 using InnoDB,, MySQL 3.23.58,  MySQL 
4.0.1alpha
 http://www.mysql.com/products/connector-j";>Connector/J 
3.0.11-stable (the official JDBC Driver)
 http://mmmysql.sourceforge.net";>mm.mysql 2.0.14 (an old 3rd 
party JDBC Driver)
 
-
 
 Before you proceed, don't forget to copy the JDBC Driver's jar into 
$CATALINA_HOME/lib.
 
@@ -207,6 +214,7 @@ Ensure that you follow these instruction
 Create a new test user, a new database and a single test table.
 Your MySQL user must have a password assigned. The driver
 will fail if you try to connect with an empty password.
+
 
 mysql> GRANT ALL PRIVILEGES ON *.* TO javauser@localhost 
 ->   IDENTIFIED BY 'javadude' WITH GRANT OPTION;
@@ -221,9 +229,9 @@ mysql> create table testdata (
 Note: the above user should be removed once testing is
 complete!
 
-
 
 Next insert some test data into the testdata table.
+
 
 mysql> insert into testdata values(null, 'hello', 12345);
 Query OK, 1 row affected (0.00 sec)
@@ -238,13 +246,11 @@ mysql> select * from testdata;
 
 mysql>
 
-
 
 2. Context configuration
 Configure the JNDI DataSource in Tomcat by adding a declaration for your
 resource to your Context.
-For

svn commit: r1186137 - /tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml

2011-10-19 Thread kkolinko

Author: kkolinko
Date: Wed Oct 19 12:10:21 2011
New Revision: 1186137

URL: http://svn.apache.org/viewvc?rev=1186137&view=rev
Log:
Rearranged the introductory section for DBCP pool.
Removed mention of JVM 1.4.

Modified:
tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml

Modified: tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1186137&r1=1186136&r2=1186137&view=diff
==
--- tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Wed Oct 19 
12:10:21 2011
@@ -108,23 +108,17 @@ a ServletContextListener.
 
 
 
-DBCP provides support for JDBC 2.0.  On systems using a 1.4 JVM DBCP
-will support JDBC 3.0. Please let us know if you have used DBCP and its
-JDBC 3.0 features with a 1.4 JVM.
+The default database connection pool implementation in Apache Tomcat
+relies on the libraries from the
+http://commons.apache.org/";>Apache Commons project.
+The following libraries are used:
 
 
-See the http://commons.apache.org/dbcp/configuration.html";>
-DBCP documentation for a complete list of configuration parameters.
-
-
-
-DBCP uses the Commons Database Connection Pool. It relies on
-number of Commons components:
-
 
 Commons DBCP
 Commons Pool
 
+
 
 These libraries are located in a single JAR at 
 $CATALINA_HOME/lib/tomcat-dbcp.jar. However,
@@ -132,6 +126,14 @@ only the classes needed for connection p
 packages have been renamed to avoid interfering with applications.
 
 
+DBCP 1.4 provides support for JDBC 4.0.
+
+
+
+See the http://commons.apache.org/dbcp/configuration.html";>
+DBCP documentation for a complete list of configuration parameters.
+
+
 
 
 
@@ -582,13 +584,13 @@ Change the database connect string (of t
 Here are some common problems encountered with a web application which
 uses a database and tips for how to solve them.
 
-
+
 
 Tomcat runs within a JVM.  The JVM periodically performs garbage collection
 (GC) to remove java objects which are no longer being used.  When the JVM
 performs GC execution of code within Tomcat freezes. If the maximum time
-configured for establishment of a dB connection is less than the amount
-of time garbage collection took you can get a db conneciton failure.
+configured for establishment of a database connection is less than the amount
+of time garbage collection took you can get a database connection failure.
 
 
 To collect data on how long garbage collection is taking add the



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

svn commit: r1186143 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/jndi-datasource-examples-howto.xml

2011-10-19 Thread kkolinko

Author: kkolinko
Date: Wed Oct 19 12:13:52 2011
New Revision: 1186143

URL: http://svn.apache.org/viewvc?rev=1186143&view=rev
Log:
Merged revisions r1186123, r1186137 from tomcat/trunk:
Correct the markup. s/db/database/
Rearranged the introductory section for DBCP pool.
Removed mention of JVM 1.4.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 12:13:52 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137

Modified: tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1186143&r1=1186142&r2=1186143&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml 
(original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml Wed 
Oct 19 12:13:52 2011
@@ -108,69 +108,77 @@ a ServletContextListener.
 
 
 
-DBCP provides support for JDBC 2.0.  On systems using a 1.4 JVM DBCP
-will support JDBC 3.0. Please let us know if you have used DBCP and its
-JDBC 3.0 features with a 1.4 JVM.
+The default database connecti

svn commit: r1186153 - /tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml

2011-10-19 Thread kkolinko

Author: kkolinko
Date: Wed Oct 19 12:19:25 2011
New Revision: 1186153

URL: http://svn.apache.org/viewvc?rev=1186153&view=rev
Log:
Several additional occurrences of s/dB/database/

Modified:
tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml

Modified: tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1186153&r1=1186152&r2=1186153&view=diff
==
--- tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Wed Oct 19 
12:19:25 2011
@@ -154,7 +154,7 @@ if there are no more available connectio
 
 
 There is a solution to this problem.  The Apache Commons DBCP can be
-configured to track and recover these abandoned dB connections.  Not
+configured to track and recover these abandoned database connections.  Not
 only can it recover them, but also generate a stack trace for the code
 which opened these resources and never closed them.
 
@@ -173,7 +173,7 @@ any abandoned database connections it fi
 
 
 Use the removeAbandonedTimeout attribute to set the number
-of seconds a dB connection has been idle before it is considered abandoned.
+of seconds a database connection has been idle before it is considered 
abandoned.
 
 
 removeAbandonedTimeout="60"
@@ -185,7 +185,7 @@ The default timeout for removing abandon
 
 The logAbandoned attribute can be set to true
 if you want DBCP to log a stack trace of the code which abandoned the
-dB connection resources.
+database connection resources.
 
 logAbandoned="true"
 
@@ -256,29 +256,29 @@ resource to your

svn commit: r1186160 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/jndi-datasource-examples-howto.xml

2011-10-19 Thread kkolinko

Author: kkolinko
Date: Wed Oct 19 12:26:46 2011
New Revision: 1186160

URL: http://svn.apache.org/viewvc?rev=1186160&view=rev
Log:
CTR: docs
Merged revisions r1186123, r1186137, r1186153 from tomcat/trunk:
Correct the markup. s/db/database/
Rearranged the introductory section for DBCP pool.
Removed mention of JVM 1.4.

There is a difference wrt TC7 version of this commit
that Tomcat 6 uses DBCP 1.3 / JDBC 3.0.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 12:26:46 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,943112,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,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575
 
,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1148216,1148471,1152601,1156171,1156519,1164567,1167394,1172233-1172234,1172236,1173614,1174353,1175158,1175190,1176799,1

svn commit: r1186164 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/jndi-datasource-examples-howto.xml

2011-10-19 Thread kkolinko

Author: kkolinko
Date: Wed Oct 19 12:28:20 2011
New Revision: 1186164

URL: http://svn.apache.org/viewvc?rev=1186164&view=rev
Log:
Merged revision 1186153 from tomcat/trunk:
Several additional occurrences of s/dB/database/

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 12:28:20 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153

Modified: tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1186164&r1=1186163&r2=1186164&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml 
(original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml Wed 
Oct 19 12:28:20 2011
@@ -154,7 +154,7 @@ if there are no more available connectio
 
 
 There is a solution to this problem.  The Apache Commons DBCP can be
-configured to track and recover these abandoned dB connections.  Not
+configured to track and recover these abandoned database connections.  Not
 only can it recover them, but als

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

2011-10-19 Thread kkolinko

Author: kkolinko
Date: Wed Oct 19 13:25:52 2011
New Revision: 1186200

URL: http://svn.apache.org/viewvc?rev=1186200&view=rev
Log:
vote and 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=1186200&r1=1186199&r2=1186200&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Oct 19 13:25:52 2011
@@ -78,6 +78,16 @@ PATCHES PROPOSED TO BACKPORT:
   (1181028,1181136 in trunk)
   +1: markt, rjung
   -1:
+  +1: kkolinko: Performing a merge does not complete cleanly. Here is the
+  actual patch:
+   http://people.apache.org/~kkolinko/patches/2011-10-19_tc6_51940.patch
+
+  A slightly changed version of the patch, that adds a finally{} block
+  to restore original method name, so that it is printed correctly
+  in access logs:
+   http://people.apache.org/~kkolinko/patches/2011-10-19_tc6_51940_v2.patch
+  +1: kkolinko
+  -1:
 
 
 PATCHES/ISSUES THAT ARE STALLED



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

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

2011-10-19 Thread kkolinko

Author: kkolinko
Date: Wed Oct 19 13:57:11 2011
New Revision: 1186222

URL: http://svn.apache.org/viewvc?rev=1186222&view=rev
Log:
vote

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1186222&r1=1186221&r2=1186222&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Oct 19 13:57:11 2011
@@ -67,6 +67,7 @@ PATCHES PROPOSED TO BACKPORT:
 * Fix BIO + SSL + Java7
   http://svn.apache.org/viewvc?view=revision&revision=1174884
   +1: markt, rjung
+  +1: kkolinko: Together with r1174882
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51940



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

AW: AW: Bug 51334 - Federation support for Tomcat

2011-10-19 Thread Oliver Wulff

Hi Mark

>>>
The lack of demand argument applies equally to WS-Federation considered
in isolation. I'd like to see that there was at least some traction
behind this in the Tomcat community before going with option 2.

I understand where you're coming from.

IMHO, the federation functionality gives a lot of added value to tomcat for 
being able to support single sign across within an enterprise as well as across 
enterprises or in the cloud. Thus tomcat can even better compete with big 
application servers because you get enterprise SSO only by also using the 
identity suite.

Very often, big enterprises uses Microsoft Active Directory (which includes the 
federation IDP (ADFS)) to authenticate their users which includes ADFS. The 
federation plugin can integrate with ADFS out-of-the-box - not yet tested. 
Thus, you get SSO within your enterprise without deploying another identity 
suite with your tomcat based applications.

Therefore, I think we can get better confidence from potential customers if the 
federation plugin is provided as part of Tomcat extras module.

I'll accept your decision and proceed with that. Thus let me know what the next 
steps are.

Thanks
Oliver

Von: Mark Thomas [ma...@apache.org]
Gesendet: Dienstag, 18. Oktober 2011 10:54
Bis: Tomcat Developers List
Betreff: Re: AW: Bug 51334 - Federation support for Tomcat

On 17/10/2011 15:29, Oliver Wulff wrote:
> Hi Mark
>
> Thanks for your quick feedback...
>
> There are two pieces - IDP and authenticator - where we have to
> decide how to package this.
>

> Given that Tomcat doesn't support web services out of the box, I
> don't think it makes sense to ship WS-Federation as part of the
> standard Tomcat distribution. That rules out option 1 in my view.

> WS-Federation doesn't address federation to web services only.
> WS-Federation describes an active requestor profile (which is for web
> service clients/providers) and a passive requestor profile (which is
> for sso for web applications). The patch I applied is for the later.

OK. Understood.

> That leaves 2 or 3. I remain to be convinced that there is any
> demand for this functionality. I haven't seen any evidence (questions
> on the users list, bugs raised in Bugzilla) that folks are using the
> JSR-109 support in the extras package so I find it hard to see how
> there would be much demand for WS-Federation

> As mentioned above WS-Federation passive requestor profile doesn't
> relate to web services and JSR-109 at all. Instead it gives the
> tomcat community a great added value for enterprise web applications
> where authentication is externalized to another site and provides the
> basis to implement claims based authorization. This kind of
> funtionality does further enable users to use Tomcat in the cloud but
> keep the authentication within the company.
>
> Considering this, I'd prefer to go with option 2 (extra tomcat
> module).

The lack of demand argument applies equally to WS-Federation considered
in isolation. I'd like to see that there was at least some traction
behind this in the Tomcat community before going with option 2. If we
were seeing the same number of references to WS-Federation on the users
mailing list as we see for SecurityFilter then option 2 would be a no
brainer.

Given that the key here is building up a community of users, another
possibility would be to go via the Apache incubator.

Mark

-
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: AW: AW: Bug 51334 - Federation support for Tomcat

2011-10-19 Thread Mark Thomas

On 19/10/2011 15:16, Oliver Wulff wrote:
> Hi Mark
> 

> The lack of demand argument applies equally to WS-Federation 
> considered in isolation. I'd like to see that there was at least some
> traction behind this in the Tomcat community before going with option
> 2.
> 
> I understand where you're coming from.
> 
> IMHO, the federation functionality gives a lot of added value to 
> tomcat for being able to support single sign across within an 
> enterprise as well as across enterprises or in the cloud. Thus tomcat
> can even better compete with big application servers because you get
> enterprise SSO only by also using the identity suite.

There are plenty of other SSO options out there that ship with the
necessary modules for Tomcat. That, combined with the minimal interest
in WS-Federation seen in the community to date, makes me think that a
separate project is the right place for this. It is a model that has
worked well for many SSO solutions for a number of years.

There have been preliminary discussions about merging SecurityFilter
into the Tomcat code base as it is so widely used but that discussion
died down without anything happening. And I am fine with that.

Personally I think something needs to be as widely used as
SecurityFilter before we even think about adding it to the Tomcat code
base. The Tuckey UrlRewriteFilter is another component that gets used
often enough that I'd be happy to see it added to the code base. I'll
add at this point I am just using these as examples. I am *not*
suggesting that these projects to be borged by the Tomcat project. If
they choose to approach us, I am sure we'd listen carefully to their
proposals.

> Very often, big enterprises uses Microsoft Active Directory (which 
> includes the federation IDP (ADFS)) to authenticate their users which
> includes ADFS. The federation plugin can integrate with ADFS 
> out-of-the-box - not yet tested. Thus, you get SSO within your 
> enterprise without deploying another identity suite with your tomcat
>  based applications.

If the enterprise is using Microsoft AD then Tomcat can plug directly
into that via the built-in Kerberos support. See [1]. The addition of
that feature had the right balance of user demand and minimal code
additions / changes to Tomcat.

> Therefore, I think we can get better confidence from potential 
> customers if the federation plugin is provided as part of Tomcat 
> extras module.

That is not a sufficient reason to add it to the build. I get the
impression, rightly or wrongly, that this is an attempt to to get a jump
start for a little used SSO solution by getting it included in the
Tomcat build. That isn't the way the ASF works.

Every feature added to Tomcat is considered (informally) in terms of:
- user demand
- additional code added
- changes that might break other stuff
- ease of maintenance

When I measure WS-Federation against these criteria it does not reach
the threshold I think it needs to meet in order to get included in
either the core distribution or as a bundled extra.

> I'll accept your decision and proceed with that. Thus let me know 
> what the next steps are.

This is not my decision, it is the community's decision. I am just one
voice in that community with a tendency to state an opinion given the
opportunity. You need to convince the community that this is worth
doing. Actually, that isn't strictly true. Since this is a code change
any committer could veto it. I'd suggest leaving it a few days to see if
any of the other committers comment.

Mark

[1] http://tomcat.apache.org/tomcat-7.0-doc/windows-auth-howto.html

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

AW: AW: AW: Bug 51334 - Federation support for Tomcat

2011-10-19 Thread Oliver Wulff

>>>
I get the impression, rightly or wrongly, that this is an attempt to to get a 
jump
start for a little used SSO solution by getting it included in the
Tomcat build. That isn't the way the ASF works.
>>>
This is not the case. It's the other way around. The federation plugin should 
help Tomcat to better compete with the big closed source solutions by 
supporting an industry standard. In constrast to buy and integrate a security 
product where you have to deploy custom agents to all sort of containers to be 
able to integrate with the centrally running security component (usually the 
communication between the agents and the central security component is 
proprietary).

What would be the next steps to go with Apache Extras?

>>>
This is not my decision, it is the community's decision. I am just one
voice in that community with a tendency to state an opinion given the
opportunity. You need to convince the community that this is worth
doing. Actually, that isn't strictly true. Since this is a code change
any committer could veto it. I'd suggest leaving it a few days to see if
any of the other committers comment.
>>>
+1

Thanks
Oliver

Von: Mark Thomas [ma...@apache.org]
Gesendet: Mittwoch, 19. Oktober 2011 16:41
Bis: Tomcat Developers List
Betreff: Re: AW: AW: Bug 51334 - Federation support for Tomcat

On 19/10/2011 15:16, Oliver Wulff wrote:
> Hi Mark
>

> The lack of demand argument applies equally to WS-Federation
> considered in isolation. I'd like to see that there was at least some
> traction behind this in the Tomcat community before going with option
> 2.
>
> I understand where you're coming from.
>
> IMHO, the federation functionality gives a lot of added value to
> tomcat for being able to support single sign across within an
> enterprise as well as across enterprises or in the cloud. Thus tomcat
> can even better compete with big application servers because you get
> enterprise SSO only by also using the identity suite.

There are plenty of other SSO options out there that ship with the
necessary modules for Tomcat. That, combined with the minimal interest
in WS-Federation seen in the community to date, makes me think that a
separate project is the right place for this. It is a model that has
worked well for many SSO solutions for a number of years.

There have been preliminary discussions about merging SecurityFilter
into the Tomcat code base as it is so widely used but that discussion
died down without anything happening. And I am fine with that.

Personally I think something needs to be as widely used as
SecurityFilter before we even think about adding it to the Tomcat code
base. The Tuckey UrlRewriteFilter is another component that gets used
often enough that I'd be happy to see it added to the code base. I'll
add at this point I am just using these as examples. I am *not*
suggesting that these projects to be borged by the Tomcat project. If
they choose to approach us, I am sure we'd listen carefully to their
proposals.

> Very often, big enterprises uses Microsoft Active Directory (which
> includes the federation IDP (ADFS)) to authenticate their users which
> includes ADFS. The federation plugin can integrate with ADFS
> out-of-the-box - not yet tested. Thus, you get SSO within your
> enterprise without deploying another identity suite with your tomcat
>  based applications.

If the enterprise is using Microsoft AD then Tomcat can plug directly
into that via the built-in Kerberos support. See [1]. The addition of
that feature had the right balance of user demand and minimal code
additions / changes to Tomcat.

> Therefore, I think we can get better confidence from potential
> customers if the federation plugin is provided as part of Tomcat
> extras module.

That is not a sufficient reason to add it to the build. I get the
impression, rightly or wrongly, that this is an attempt to to get a jump
start for a little used SSO solution by getting it included in the
Tomcat build. That isn't the way the ASF works.

Every feature added to Tomcat is considered (informally) in terms of:
- user demand
- additional code added
- changes that might break other stuff
- ease of maintenance

When I measure WS-Federation against these criteria it does not reach
the threshold I think it needs to meet in order to get included in
either the core distribution or as a bundled extra.

> I'll accept your decision and proceed with that. Thus let me know
> what the next steps are.

This is not my decision, it is the community's decision. I am just one
voice in that community with a tendency to state an opinion given the
opportunity. You need to convince the community that this is worth
doing. Actually, that isn't strictly true. Since this is a code change
any committer could veto it. I'd suggest leaving it a few days to see if
any of the other committers comment.

Mark

[1] http://tomcat.apache.org/tomcat-7.0-doc/windows-auth-howto.html

svn commit: r1186254 - in /tomcat/trunk/java/org/apache/jasper: JspCompilationContext.java compiler/JspUtil.java

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 15:06:17 2011
New Revision: 1186254

URL: http://svn.apache.org/viewvc?rev=1186254&view=rev
Log:
Code clean-up, no functional change.

Modified:
tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java

Modified: tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=1186254&r1=1186253&r2=1186254&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java Wed Oct 19 
15:06:17 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -50,7 +50,7 @@ import org.apache.juli.logging.LogFactor
  * the instance variables are set at different points.
  *
  * Most of the path-related stuff is here - mangling names, versions, dirs,
- * loading resources and dealing with uris. 
+ * loading resources and dealing with uris.
  *
  * @author Anil K. Vijendran
  * @author Harish Prabandham
@@ -126,7 +126,7 @@ public class JspCompilationContext {
 }
 
 public JspCompilationContext(String tagfile,
- TagInfo tagInfo, 
+ TagInfo tagInfo,
  Options options,
  ServletContext context,
  JspServletWrapper jsw,
@@ -139,20 +139,21 @@ public class JspCompilationContext {
 }
 
 /*  Methods to override  */
-
+
 /** -- Class path and loader -- */
 
 /**
- * The classpath that is passed off to the Java compiler. 
+ * The classpath that is passed off to the Java compiler.
  */
 public String getClassPath() {
-if( classPath != null )
+if( classPath != null ) {
 return classPath;
+}
 return rctxt.getClassPath();
 }
 
 /**
- * The classpath that is passed off to the Java compiler. 
+ * The classpath that is passed off to the Java compiler.
  */
 public void setClassPath(String classPath) {
 this.classPath = classPath;
@@ -163,8 +164,9 @@ public class JspCompilationContext {
  * this JSP?
  */
 public ClassLoader getClassLoader() {
-if( loader != null )
+if( loader != null ) {
 return loader;
+}
 return rctxt.getParentClassLoader();
 }
 
@@ -183,7 +185,7 @@ public class JspCompilationContext {
 }
 
 /** -- Input/Output  -- */
-
+
 /**
  * The output directory to generate code into.  The output directory
  * is make up of the scratch directory, which is provide in Options,
@@ -200,7 +202,7 @@ public class JspCompilationContext {
 /**
  * Create a "Compiler" object based on some init param data. This
  * is not done yet. Right now we're just hardcoding the actual
- * compilers that are created. 
+ * compilers that are created.
  */
 public Compiler createCompiler() {
 if (jspCompiler != null ) {
@@ -230,7 +232,7 @@ public class JspCompilationContext {
 }
 
 protected Compiler createCompiler(String className) {
-Compiler compiler = null; 
+Compiler compiler = null;
 try {
 compiler = (Compiler) Class.forName(className).newInstance();
 } catch (InstantiationException e) {
@@ -248,14 +250,14 @@ public class JspCompilationContext {
 }
 return compiler;
 }
-
+
 public Compiler getCompiler() {
 return jspCompiler;
 }
 
 /** -- Access resources in the webapp -- */
 
-/** 
+/**
  * Get the full value of a URI relative to this compilations context
  * uses current file as the base.
  */
@@ -272,7 +274,7 @@ public class JspCompilationContext {
 /**
  * Gets a resource as a stream, relative to the meanings of this
  * context's implementation.
- * @return a null if the resource cannot be found or represented 
+ * @return a null if the resource cannot be found or represented
  * as an InputStream.
  */
 public java.io.InputStream getResourceAsStream(String res) {
@@ -311,7 +313,7 @@ public class JspCompilationContext {
 return context.getResourcePaths(canonicalURI(path));
 }
 
-

svn commit: r1186257 - in /tomcat/trunk/java/org/apache/jasper: JspCompilationContext.java compiler/JspUtil.java

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 15:09:07 2011
New Revision: 1186257

URL: http://svn.apache.org/viewvc?rev=1186257&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52051
Return a 404 if an attempt is made to process a resource that does not
exist

Modified:
tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java

Modified: tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=1186257&r1=1186256&r2=1186257&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java Wed Oct 19 
15:09:07 2011
@@ -611,6 +611,9 @@ public class JspCompilationContext {
 jsw.setLastModificationTest(-1);
 }
 throw ex;
+} catch (FileNotFoundException fnfe) {
+// Re-throw to let caller handle this - will result in a 404
+throw fnfe;
 } catch (Exception ex) {
 JasperException je = new JasperException(
 Localizer.getMessage("jsp.error.unable.compile"),

Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java?rev=1186257&r1=1186256&r2=1186257&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java Wed Oct 19 
15:09:07 2011
@@ -17,6 +17,7 @@
 
 package org.apache.jasper.compiler;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -685,7 +686,8 @@ public class JspUtil {
 String jarEntryName = fname.substring(1, fname.length());
 ZipEntry jarEntry = jarFile.getEntry(jarEntryName);
 if (jarEntry == null) {
-err.jspError("jsp.error.file.not.found", fname);
+throw new FileNotFoundException(Localizer.getMessage(
+"jsp.error.file.not.found", fname));
 }
 in = jarFile.getInputStream(jarEntry);
 } else {
@@ -693,7 +695,8 @@ public class JspUtil {
 }
 
 if (in == null) {
-err.jspError("jsp.error.file.not.found", fname);
+throw new FileNotFoundException(Localizer.getMessage(
+"jsp.error.file.not.found", fname));
 }
 
 return in;



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

svn commit: r1186260 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/JspCompilationContext.java java/org/apache/jasper/compiler/JspUtil.java

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 15:11:15 2011
New Revision: 1186260

URL: http://svn.apache.org/viewvc?rev=1186260&view=rev
Log:
Code clean-up. No functional change.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspCompilationContext.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspUtil.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 15:11:15 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254

Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspCompilationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=1186260&r1=1186259&r2=1186260&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspCompilationContext.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspCompilationContext.java Wed 
Oct 19 15:11:15 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICEN

svn commit: r1186262 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/JspCompilationContext.java java/org/apache/jasper/compiler/JspUtil.java webapps/docs/changelog.xml

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 15:14:49 2011
New Revision: 1186262

URL: http://svn.apache.org/viewvc?rev=1186262&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52051
Return a 404 if an attempt is made to process a resource that does not
exist

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspCompilationContext.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspUtil.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 15:14:49 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257

Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspCompilationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=1186262&r1=1186261&r2=1186262&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspCompilationContext.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspCompilationContext.java Wed 
Oct 19 15:14:49 2011
@@ -654,6 +654,9 @@ public class JspCompilationContext {
 jsw.setLastModificationTest(-1

DO NOT REPLY [Bug 52051] NullPointerException when Jasper tries to compile a directory

2011-10-19 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Mark Thomas  2011-10-19 15:17:39 UTC ---
Fixed in trunk (8.0.x) and 7.0.x and will be included in 7.0.23 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

DO NOT REPLY [Bug 52059] New: Windows Registry are not removed after uninstall

2011-10-19 Thread bugzilla

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

 Bug #: 52059
   Summary: Windows Registry are not removed after uninstall
   Product: Tomcat 7
   Version: 7.0.22
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: normal
  Priority: P2
 Component: Packaging
AssignedTo: dev@tomcat.apache.org
ReportedBy: gregory.bloq...@gmail.com
Classification: Unclassified


The keys in the Windows Registry (= HKEY_LOCAL_MACHINE\SOFTWARE\Apache Software
Foundation\Tomcat\7.0\Tomcat7) are not removed after an uninstall of Tomcat
7.0.22.

-- 
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 52055] ChunkedInputFilter is not recycled for servlet 3.0 asynchronous request

2011-10-19 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  2011-10-19 16:21:02 UTC ---
This is an application error, not a Tomcat bug. I have confirmed that this
works as expected. The users mailing list is the place to seek further help.

-- 
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 52059] Windows Registry are not removed after uninstall

2011-10-19 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WORKSFORME

--- Comment #1 from Mark Thomas  2011-10-19 16:24:22 UTC ---
This works for me.

I suggest you follow this up on the Tomcat users list.

Please do not re-open this issue unless you can provide full details of how to
reproduce this issue with a clean 7.0.22 install / uninstall.

-- 
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 51883] NullPointerException in StandardContextValve.invoke

2011-10-19 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution||WONTFIX

--- Comment #5 from Mark Thomas  2011-10-19 16:25:09 UTC ---
Three weeks and no further information. Closing as WONTFIX as per previous
comment.

-- 
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 50860] In case of invalid or empty slqQuery connection are always invalidated without usefull information

2011-10-19 Thread bugzilla

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

--- Comment #1 from Alexander Pogrebnyak  
2011-10-19 16:57:10 UTC ---
Although it seems similar to Bug 50660, the case of a `null` query is really a
misconfiguration error.

I think it should be treated differently from "invalid" SQL case and in case of
`null` query throw RuntimeException that tells the user about misconfiguration.

I also think that obvious configuration validation (validationQuery is null or
empty, when validation is enabled ) has to happen when the connection is
initialized (or better yet in ConnectionPool.init), because in my test it would
not happen before the validationInterval would have expired, and a one-off
message in the middle of log stream does not call to much attention.

-- 
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 50860] In case of invalid or empty slqQuery connection are always invalidated without usefull information

2011-10-19 Thread bugzilla

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

Alexander Pogrebnyak  changed:

   What|Removed |Added

 CC||alex-pub.apache-ant@reflexi
   ||on.net

-- 
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 51905] Infinite loop when shutting down AprEndpoint

2011-10-19 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Mark Thomas  2011-10-19 17:09:17 UTC ---
Fixed in 6.0.x and will be included in 6.0.34 onwards (r1186001).

-- 
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 51940] Form Authentication Valve should restore request body on PUT method

2011-10-19 Thread bugzilla

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

--- Comment #10 from Mark Thomas  2011-10-19 18:02:15 UTC ---
(In reply to comment #9)
> 1. I tried to test this in trunk, and replaying a POST request fails for me.

That is a side-effect of r987955 which is not directly related to this bug.

> 2. request.getCoyoteRequest().method().setString("GET");
> is seen as GET in access log.  Not much of an issue though, as anyway we 
> return
> not what was originally requested by client.
> 
> I think that to fix this one can restore the original method in
> FormAuthenticator#forwardToLoginPage(..) when disp.forward() call returns.

That would work. I'm on the fence. We can record what was requested or what we
process.

-- 
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: r1186377 - /tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 18:15:51 2011
New Revision: 1186377

URL: http://svn.apache.org/viewvc?rev=1186377&view=rev
Log:
Code clean-up. No functional change.

Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?rev=1186377&r1=1186376&r2=1186377&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java 
Wed Oct 19 18:15:51 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -55,7 +55,7 @@ import org.apache.tomcat.util.http.MimeH
 
 public class FormAuthenticator
 extends AuthenticatorBase {
-
+
 private static final Log log = LogFactory.getLog(FormAuthenticator.class);
 
 // - Instance Variables
@@ -102,9 +102,9 @@ public class FormAuthenticator
 return characterEncoding;
 }
 
-
+
 /**
- * Set the character encoding to be used to read the username and 
password. 
+ * Set the character encoding to be used to read the username and password.
  */
 public void setCharacterEncoding(String encoding) {
 characterEncoding = encoding;
@@ -156,42 +156,48 @@ public class FormAuthenticator
 Principal principal = request.getUserPrincipal();
 String ssoId = (String) request.getNote(Constants.REQ_SSOID_NOTE);
 if (principal != null) {
-if (log.isDebugEnabled())
+if (log.isDebugEnabled()) {
 log.debug("Already authenticated '" +
 principal.getName() + "'");
+}
 // Associate the session with any existing SSO session
-if (ssoId != null)
+if (ssoId != null) {
 associate(ssoId, request.getSessionInternal(true));
+}
 return (true);
 }
 
 // Is there an SSO session against which we can try to reauthenticate?
 if (ssoId != null) {
-if (log.isDebugEnabled())
+if (log.isDebugEnabled()) {
 log.debug("SSO Id " + ssoId + " set; attempting " +
   "reauthentication");
+}
 // Try to reauthenticate using data cached by SSO.  If this fails,
 // either the original SSO logon was of DIGEST or SSL (which
 // we can't reauthenticate ourselves because there is no
 // cached username and password), or the realm denied
 // the user's reauthentication for some reason.
 // In either case we have to prompt the user for a logon */
-if (reauthenticateFromSSO(ssoId, request))
+if (reauthenticateFromSSO(ssoId, request)) {
 return true;
+}
 }
 
 // Have we authenticated this user before but have caching disabled?
 if (!cache) {
 session = request.getSessionInternal(true);
-if (log.isDebugEnabled())
+if (log.isDebugEnabled()) {
 log.debug("Checking for reauthenticate in session " + session);
+}
 String username =
 (String) session.getNote(Constants.SESS_USERNAME_NOTE);
 String password =
 (String) session.getNote(Constants.SESS_PASSWORD_NOTE);
 if ((username != null) && (password != null)) {
-if (log.isDebugEnabled())
+if (log.isDebugEnabled()) {
 log.debug("Reauthenticating username '" + username + "'");
+}
 principal =
 context.getRealm().authenticate(username, password);
 if (principal != null) {
@@ -203,8 +209,9 @@ public class FormAuthenticator
 return (true);
 }
 }
-if (log.isDebugEnabled())
+if (log.isDebugEnabled()) {
 log.debug("Reauthentication failed, proceed normally");
+}
 }
 }
 
@@ -212,10 +219,11 @@ public class FormAuthenticator
 // authentication?  If so, forward the *original* request instead.
 if (matchRequest(requ

svn commit: r1186378 - /tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 18:16:32 2011
New Revision: 1186378

URL: http://svn.apache.org/viewvc?rev=1186378&view=rev
Log:
Minor refactoring. No functional change.

Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?rev=1186378&r1=1186377&r2=1186378&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java 
Wed Oct 19 18:16:32 2011
@@ -530,10 +530,11 @@ public class FormAuthenticator
 request.addCookie(cookies.next());
 }
 
+String method = saved.getMethod();
 MimeHeaders rmh = request.getCoyoteRequest().getMimeHeaders();
 rmh.recycle();
-boolean cachable = "GET".equalsIgnoreCase(saved.getMethod()) ||
-   "HEAD".equalsIgnoreCase(saved.getMethod());
+boolean cachable = "GET".equalsIgnoreCase(method) ||
+   "HEAD".equalsIgnoreCase(method);
 Iterator names = saved.getHeaderNames();
 while (names.hasNext()) {
 String name = names.next();
@@ -567,7 +568,6 @@ public class FormAuthenticator
 }
 
 ByteChunk body = saved.getBody();
-String method = saved.getMethod();
 
 if (body != null) {
 request.getCoyoteRequest().action



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

svn commit: r1186379 - /tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 18:17:09 2011
New Revision: 1186379

URL: http://svn.apache.org/viewvc?rev=1186379&view=rev
Log:
Fix the regression caused by r987955

Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?rev=1186379&r1=1186378&r2=1186379&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java 
Wed Oct 19 18:17:09 2011
@@ -562,7 +562,7 @@ public class FormAuthenticator
 
 // Swallow any request body since we will be replacing it
 byte[] buffer = new byte[4096];
-InputStream is = request.getInputStream();
+InputStream is = request.createInputStream();
 while (is.read(buffer) >= 0) {
 // Ignore request body
 }



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

svn commit: r1186380 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/authenticator/FormAuthenticator.java

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 18:17:27 2011
New Revision: 1186380

URL: http://svn.apache.org/viewvc?rev=1186380&view=rev
Log:
Code clean-up. No functional change.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 18:17:27 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?rev=1186380&r1=1186379&r2=1186380&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
 Wed Oct 19 18:17:27 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www

svn commit: r1186381 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/authenticator/FormAuthenticator.java

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 18:18:11 2011
New Revision: 1186381

URL: http://svn.apache.org/viewvc?rev=1186381&view=rev
Log:
Minor refactoring. No functional change.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 18:18:11 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186378

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?rev=1186381&r1=1186380&r2=1186381&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
 Wed Oct 19 18:18:11 2011
@@ -530,10 +530,11 @@ public class FormAuthenticator
 request.addCookie(cookies.next());
 }
 
+String method = saved.getMethod();
 MimeHeaders rmh = request.getCoyoteRequest().getMimeHeaders();

svn commit: r1186383 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/authenticator/FormAuthenticator.java webapps/docs/changelog.xml

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 18:21:07 2011
New Revision: 1186383

URL: http://svn.apache.org/viewvc?rev=1186383&view=rev
Log:
Fix the regression caused by r987955
Correct a regression in the fix for bug49779 that prevented parameters POSTed 
by an unauthenticated user to a page that required authentication from being 
lost during the authentication process.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 18:21:07 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186378
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?rev=1186383&r1=1186382&r2=1186383&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
 Wed

[Tomcat Wiki] Update of "PoweredBy" by prolanguage

2011-10-19 Thread Apache Wiki

Dear Wiki user,

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

The "PoweredBy" page has been changed by prolanguage:
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=375&rev2=376

  #pragma section-numbers 2
  = Sites, Applications, and Systems that are Powered By Tomcat =
- This page is a list of some, in all likelihood a very small fraction 
actually, of the sites out there that use [[http://tomcat.apache.org|Apache 
Tomcat]] in production. For security and other policy-related reasons, many 
organizations choose not to disclose the server they use. Tomcat has been 
downloaded more than 10 million times: assuming even a 1% production adoption 
rate results in more than 10 installations. As an aside for the curious, 
you can see recent Tomcat download statistics on 
[[http://people.apache.org/~vgritsenko/stats/projects/tomcat.html|Vadim 
Gritsenko's page]]. Note, however, that these represent downloads from 
apache.org servers only, and not from mirrors, so they are likely to represent 
only a small minority of downloads: the total number is much (more than an 
order of magnitude) greater. Companies that support Tomcat, such as 
[[http://www.springsource.com|SpringSource]] claim more than half of the global 
Fortune 500 as their clients.
+ This page is a list of some, in all likelihood a very small fraction 
actually, of the sites out there that use [[http://tomcat.apache.org|Apache 
Tomcat]] in production. For security and other policy-related reasons, many 
organizations choose not to disclose the server they 
use[[http://www.uebersetzung1.wordpress.com|.]] Tomcat has been downloaded more 
than 10 million times: assuming even a 1% production adoption rate results in 
more than 10 installations. As an aside for the curious, you can see recent 
Tomcat download statistics on 
[[http://people.apache.org/~vgritsenko/stats/projects/tomcat.html|Vadim 
Gritsenko's page]]. Note, however, that these represent downloads from 
apache.org servers only, and not from mirrors, so they are likely to represent 
only a small minority of downloads: the total number is much (more than an 
order of magnitude) greater. Companies that support Tomcat, such as  claim more 
than half of the global Fortune 500 as their clients.
  
  This page is organized by categories: [[#pub|sites with publications]], 
[[#user|sites added by users]], [[#surveys|independent surveys]], and 
[[#more|more]]. Anyone can and is encouraged to add to this page: please add 
your site, application, or system as you see fit. You do need to register with 
the Apache wiki system to edit this page: simply click the login or user 
preferences links at the top right of your screen to do so. Don't worry if you 
don't think it fits here or into any particular category: we would like to see 
your application listed no matter how big, how small, or how miscategorized ;) 
Some of these applications are simply compatible with, ship with, or run on 
Tomcat. Others are specifically designed or documented with Tomcat as the 
container in mind.
  

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

DO NOT REPLY [Bug 52055] ChunkedInputFilter is not recycled for servlet 3.0 asynchronous request

2011-10-19 Thread bugzilla

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

--- Comment #2 from Raymond Feng  2011-10-19 19:05:06 UTC ---
Created attachment 27821
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=27821
Test case

This the war file that contains a simple servlet filter that uses servelet 3.0
async api to echo the posted content. 

package test;

import java.io.IOException;
import java.io.Reader;

import javax.servlet.AsyncContext;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;

public class TestAsyncFilter implements Filter {

@Override
public void destroy() {

}

@Override
public void doFilter(ServletRequest request, ServletResponse response,
FilterChain chain) throws IOException,
ServletException {
HttpServletRequest httpServletRequest = (HttpServletRequest)request;
String path = httpServletRequest.getServletPath();
if ("POST".equalsIgnoreCase(httpServletRequest.getMethod()) &&
path.startsWith("/test")) {
final AsyncContext asyncContext = request.startAsync();
asyncContext.start(new Runnable() {

@Override
public void run() {
try {
readContent(asyncContext);
} catch (IOException e) {
e.printStackTrace();
}
}
});

} else {
chain.doFilter(request, response);
}
}

private void readContent(AsyncContext asyncContext) throws IOException {
HttpServletRequest httpServletRequest =
(HttpServletRequest)asyncContext.getRequest();
Reader reader = httpServletRequest.getReader();
StringBuilder sb = new StringBuilder();
char[] buf = new char[4096];
while (true) {
int len = reader.read(buf);
if (len < 0) {
break;
} else {
sb.append(buf, 0, len);
}
}
System.out.println("Request: " + sb.toString());
asyncContext.getResponse().getWriter().println(sb.toString());
asyncContext.complete();
}

@Override
public void init(FilterConfig config) throws ServletException {

}

}


And the test client is:

package test;

import java.io.IOException;

import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.util.EntityUtils;

public class TestHttpClient {
public static void main(String[] args) throws IOException {
HttpClient client = new DefaultHttpClient();
for (int i = 0; i < 5; i++) {
HttpPost post = new
HttpPost("http://localhost:8080/tomcat7-async/test";);
StringEntity entity = new StringEntity("Test String: " + i);
entity.setChunked(true);
post.setEntity(entity);
HttpResponse response = client.execute(post);
System.out.println("Response[" + i + "]: " +
EntityUtils.toString(response.getEntity()));
}
}
}

-- 
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 52055] ChunkedInputFilter is not recycled for servlet 3.0 asynchronous request

2011-10-19 Thread bugzilla

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

Raymond Feng  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|INVALID |

--- Comment #3 from Raymond Feng  2011-10-19 19:06:17 UTC ---
I would like to reopen the bug with the test case to prove I was wrong :-).

Thanks,
Raymond

-- 
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 "LocalBadContent" by ChuckCaldarale

2011-10-19 Thread Apache Wiki

Dear Wiki user,

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

The "LocalBadContent" page has been changed by ChuckCaldarale:
http://wiki.apache.org/tomcat/LocalBadContent?action=diff&rev1=34&rev2=35

  u-tokyo\.ac\.jp
  uebersetzer\.blogieren\.de
  uebersetzung-deutsch-englisch\.com
+ uebersetzung1\.wordpress\.com
  uebersetzungsforum\.forumieren\.eu
  ulcertreatment\.org
  vergleich-riester-rente\.net

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

Re: ApacheMeetupsNa11 tomcat one?

2011-10-19 Thread Rainer Jung

On 18.10.2011 10:15, Keiichi Fujino wrote:
> 2011/10/11 jean-frederic clere :
>> Hi,
>>
>> Do we want to "organize" a Tomcat meetup during the ApacheCon?
>>
> 
> +1
> 
> I'll be there.
> I am going to stay in Vancouver from Monday to Friday.

I'll be there too, including the weekends before and after.

See you!

Rainer


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

DO NOT REPLY [Bug 52055] ChunkedInputFilter is not recycled for servlet 3.0 asynchronous request

2011-10-19 Thread bugzilla

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

--- Comment #4 from Raymond Feng  2011-10-19 20:29:45 UTC ---
To reproduce the problem, deploy the WAR and run the test.TestHttpClient to
send chunked post.

BTW, the same application works well under Jetty 8.x. 

I also tried to convert the filter to a async servlet and the same behavior
happened. Only the first request was processed correctly and other ones
received empty content.

-- 
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 52055] ChunkedInputFilter is not recycled for servlet 3.0 asynchronous request

2011-10-19 Thread bugzilla

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

--- Comment #5 from Mark Thomas  2011-10-19 20:33:09 UTC ---
Yep, I can reproduce this now with the additional information. Previously, it
looked like the standard getParameter() confusion.

-- 
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: r1186479 - /tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 20:50:29 2011
New Revision: 1186479

URL: http://svn.apache.org/viewvc?rev=1186479&view=rev
Log:
Code clean-up. No functional change.

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

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1186479&r1=1186478&r2=1186479&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Wed 
Oct 19 20:50:29 2011
@@ -62,7 +62,7 @@ public abstract class AbstractHttp11Proc
 
 /*
  * Tracks how many internal filters are in the filter library so they
- * are skipped when looking for pluggable filters. 
+ * are skipped when looking for pluggable filters.
  */
 private int pluggableFilterIndex = Integer.MAX_VALUE;
 
@@ -252,7 +252,7 @@ public abstract class AbstractHttp11Proc
  */
 protected String server = null;
 
-
+
 public AbstractHttp11Processor(AbstractEndpoint endpoint) {
 super(endpoint);
 }
@@ -374,8 +374,9 @@ public abstract class AbstractHttp11Proc
 }
 else {
 result = new String[sArray.length + 1];
-for (int i = 0; i < sArray.length; i++)
+for (int i = 0; i < sArray.length; i++) {
 result[i] = sArray[i];
+}
 result[sArray.length] = value;
 }
 return result;
@@ -389,8 +390,9 @@ public abstract class AbstractHttp11Proc
  * @param value string
  */
 private boolean startsWithStringArray(String sArray[], String value) {
-if (value == null)
-   return false;
+if (value == null) {
+return false;
+}
 for (int i = 0; i < sArray.length; i++) {
 if (value.startsWith(sArray[i])) {
 return true;
@@ -537,12 +539,14 @@ public abstract class AbstractHttp11Proc
 response.getMimeHeaders().getValue("Content-Encoding");
 
 if ((contentEncodingMB != null)
-&& (contentEncodingMB.indexOf("gzip") != -1))
+&& (contentEncodingMB.indexOf("gzip") != -1)) {
 return false;
+}
 
 // If force mode, always compress (test purposes only)
-if (compressionLevel == 2)
-   return true;
+if (compressionLevel == 2) {
+return true;
+}
 
 // Check if sufficient length to trigger the compression
 long contentLength = response.getContentLengthLong();
@@ -558,7 +562,7 @@ public abstract class AbstractHttp11Proc
 return false;
 }
 
-
+
 /**
  * Check if compression should be used for this resource. Already checked
  * that the resource could be compressed if the client supports it.
@@ -570,12 +574,14 @@ public abstract class AbstractHttp11Proc
 request.getMimeHeaders().getValue("accept-encoding");
 
 if ((acceptEncodingMB == null)
-|| (acceptEncodingMB.indexOf("gzip") == -1))
+|| (acceptEncodingMB.indexOf("gzip") == -1)) {
 return false;
+}
 
 // If force mode, always compress (test purposes only)
-if (compressionLevel == 2)
-   return true;
+if (compressionLevel == 2) {
+return true;
+}
 
 // Check for incompatible Browser
 if (noCompressionUserAgents != null) {
@@ -594,7 +600,7 @@ public abstract class AbstractHttp11Proc
 return true;
 }
 
-
+
 /**
  * Specialized utility method: find a sequence of lower case bytes inside
  * a ByteChunk.
@@ -610,19 +616,24 @@ public abstract class AbstractHttp11Proc
 int srcEnd = b.length;
 
 for (int i = start; i <= (end - srcEnd); i++) {
-if (Ascii.toLower(buff[i]) != first) continue;
+if (Ascii.toLower(buff[i]) != first) {
+continue;
+}
 // found first char, now look for a match
 int myPos = i+1;
 for (int srcPos = 1; srcPos < srcEnd;) {
-if (Ascii.toLower(buff[myPos++]) != b[srcPos++])
+if (Ascii.toLower(buff[myPos++]) != b[srcPos++]) {
 break;
-if (srcPos == srcEnd) return i - start; // found it
+}
+if (srcPos == srcEnd) {
+return i - start; // found it
+}
 }
 }
 return -1;
 }
 
-
+
 /**
  * Determine if we must drop the connection because of the HTTP status
  * code.  Use the same list of codes as Apache/httpd.
@@ -638,7 +649,7 @@ public abstract class AbstractHttp11Proc
status == 501 /* SC_NOT_IMPLEMENTED */;

svn commit: r1186480 - /tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 20:51:08 2011
New Revision: 1186480

URL: http://svn.apache.org/viewvc?rev=1186480&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52055
Buffers not correctly reset between keep-alive requests when using async

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

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1186480&r1=1186479&r2=1186480&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Wed 
Oct 19 20:51:08 2011
@@ -1534,6 +1534,8 @@ public abstract class AbstractHttp11Proc
 if (!keepAlive) {
 return SocketState.CLOSED;
 } else {
+getInputBuffer().nextRequest();
+getOutputBuffer().nextRequest();
 return SocketState.OPEN;
 }
 }



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

svn commit: r1186484 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/AbstractHttp11Processor.java

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 20:53:26 2011
New Revision: 1186484

URL: http://svn.apache.org/viewvc?rev=1186484&view=rev
Log:
Code clean-up. No functional change.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 20:53:26 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1186484&r1=1186483&r2=1186484&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java 
Wed Oct 19 20:53:26 2011
@@ -62,7 +62,7 @@ public abstract class AbstractHttp11Proc
 
 /*
  * Tracks how many internal filters are in the filter library so they
- * are skipped when looking for pluggable filters. 
+ * are skipped when looking

svn commit: r1186485 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/AbstractHttp11Processor.java webapps/docs/changelog.xml

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 20:55:39 2011
New Revision: 1186485

URL: http://svn.apache.org/viewvc?rev=1186485&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52055
Buffers not correctly reset between keep-alive requests when using async

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 20:55:39 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1186485&r1=1186484&r2=1186485&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java 
Wed Oct 19 20:55:39 2011
@@ -1538,6 +1538,8 @@ public abstract class AbstractHttp11Proc

DO NOT REPLY [Bug 52055] ChunkedInputFilter is not recycled for servlet 3.0 asynchronous request

2011-10-19 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED

--- Comment #6 from Mark Thomas  2011-10-19 20:56:29 UTC ---
Thanks for the test case. That made tracking this down a lot easier than it
could have been.

The problem has been fixed in trunk (8.0.x) and 7.0.x and will be included in
7.0.23 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

buildbot failure in ASF Buildbot on tomcat-trunk

2011-10-19 Thread buildbot

The Buildbot has detected a new failure on builder tomcat-trunk while building 
ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-trunk/builds/2388

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1186480
Blamelist: markt

BUILD FAILED: failed compile_1

sincerely,
 -The Buildbot

svn commit: r1186502 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/tomcat/util/net/jsse/JSSESupport.java java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 21:29:20 2011
New Revision: 1186502

URL: http://svn.apache.org/viewvc?rev=1186502&view=rev
Log:
i18n for log messages

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 21:29:20 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,943112,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,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575
 
,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1148216,1148471,1152601,1156171,1156519,1164567,1167394,1172233-1172234,1172236,1173614,1174353,1175158,1175190,1176799,1177125,1177245,1177850,1177862,1178228,1178233,1184917,1184919,1185200,1185588,1186011,1186104,1186123,1186137,1186153
+/tomcat/trunk:601180,606992,612607,630314,64088

svn commit: r1186506 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/tomcat/util/net/jsse/JSSESupport.java webapps/docs/changelog.xml

2011-10-19 Thread markt

Author: markt
Date: Wed Oct 19 21:33:56 2011
New Revision: 1186506

URL: http://svn.apache.org/viewvc?rev=1186506&view=rev
Log:
Fix BIO + SSL + Java7

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 21:33:56 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,943112,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,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575
 
,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1148216,1148471,1152601,1156171,1156519,1164567,1167394,1172233-1172234,1172236,1173614,1174353,1174882,1175158,1175190,1176799,1177125,1177245,1177850,1177862,1178228,1178233,1184917,1184919,1185200,1185588,1186011,1186104,1186123,1186137,1186153
+/tomcat/trunk:601180,606992,612607,630314,

82 matches

Mail list logo