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

[markt]

Author: markt
Date: Mon Aug 15 10:29:08 2011
New Revision: 1157763

URL: http://svn.apache.org/viewvc?rev=1157763&view=rev
Log:
Fix 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=1157763&r1=1157762&r2=1157763&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Aug 15 10:29:08 2011
@@ -332,7 +332,7 @@
 web.xml. (kkolinko)
   
   
-Correctly handle uninstall with the Windows installer of the service is
+Correctly handle uninstall with the Windows installer if the service is
 installed with a name that contains a '-' character. (markt)
   
   



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

svn commit: r1157766 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/coyote/ajp/AjpProcessor.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Aug 15 10:41:54 2011
New Revision: 1157766

URL: http://svn.apache.org/viewvc?rev=1157766&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49929
No definitive information that this is the fix but back-porting Mladen's fix 
from 7.0.x should fix it.

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

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 15 10:41:54 2011
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77
 
0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901
 
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,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,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
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,

DO NOT REPLY [Bug 49929] AJP APR connector to mod_jk can result in SEND_BODY_CHUNK message after END_RESPONSE message

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution||FIXED

--- Comment #16 from Mark Thomas  2011-08-15 10:42:50 UTC ---
The fix has been back-ported and absent any reports to the contrary, the
assumption is that the issue is fixed.

-- 
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: r1157768 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/core/NamingContextListener.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Aug 15 10:46:09 2011
New Revision: 1157768

URL: http://svn.apache.org/viewvc?rev=1157768&view=rev
Log:
Unregisters MBean of DataSource when web application stops. (kfujino)

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/NamingContextListener.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 15 10:46:09 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
+/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,6950

DO NOT REPLY [Bug 51580] Severe error deploying WAR application (ExpandWar error)

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

   Severity|major   |enhancement

--- Comment #9 from Mark Thomas  2011-08-15 10:55:06 UTC ---
Changing back to an enhancement. There is no Tomcat bug here.

-- 
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: r1157810 - in /tomcat/trunk: java/org/apache/catalina/core/StandardContextValve.java java/org/apache/catalina/core/StandardHostValve.java test/org/apache/catalina/core/TestStandardContextV

[markt]

Author: markt
Date: Mon Aug 15 12:29:58 2011
New Revision: 1157810

URL: http://svn.apache.org/viewvc?rev=1157810&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51653
Move custom error handling from Host to Context.

Added:
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextValve.java   
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java
tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java?rev=1157810&r1=1157809&r2=1157810&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java Mon 
Aug 15 12:29:58 2011
@@ -21,16 +21,24 @@ package org.apache.catalina.core;
 
 import java.io.IOException;
 
+import javax.servlet.DispatcherType;
 import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.catalina.Container;
+import org.apache.catalina.Context;
 import org.apache.catalina.Wrapper;
 import org.apache.catalina.comet.CometEvent;
+import org.apache.catalina.connector.ClientAbortException;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
+import org.apache.catalina.deploy.ErrorPage;
 import org.apache.catalina.valves.ValveBase;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.ExceptionUtils;
 import org.apache.tomcat.util.buf.MessageBytes;
 
 /**
@@ -44,8 +52,9 @@ import org.apache.tomcat.util.buf.Messag
  * @version $Id$
  */
 
-final class StandardContextValve
-extends ValveBase {
+final class StandardContextValve extends ValveBase {
+
+private static final Log log = LogFactory.getLog(StandardHostValve.class);
 
 //-- Constructor
 public StandardContextValve() {
@@ -112,10 +121,10 @@ final class StandardContextValve
 // Disallow any direct access to resources under WEB-INF or META-INF
 MessageBytes requestPathMB = request.getRequestPathMB();
 if ((requestPathMB.startsWithIgnoreCase("/META-INF/", 0))
-|| (requestPathMB.equalsIgnoreCase("/META-INF"))
-|| (requestPathMB.startsWithIgnoreCase("/WEB-INF/", 0))
-|| (requestPathMB.equalsIgnoreCase("/WEB-INF"))) {
-error(response, HttpServletResponse.SC_NOT_FOUND);
+|| (requestPathMB.equalsIgnoreCase("/META-INF"))
+|| (requestPathMB.startsWithIgnoreCase("/WEB-INF/", 0))
+|| (requestPathMB.equalsIgnoreCase("/WEB-INF"))) {
+error(request, response, HttpServletResponse.SC_NOT_FOUND);
 return;
 }
 
@@ -142,13 +151,13 @@ final class StandardContextValve
 // Select the Wrapper to be used for this Request
 Wrapper wrapper = request.getWrapper();
 if (wrapper == null) {
-error(response, HttpServletResponse.SC_NOT_FOUND);
+error(request, response, HttpServletResponse.SC_NOT_FOUND);
 return;
 } else if (wrapper.isUnavailable()) {
 // May be as a result of a reload, try and find the new wrapper
 wrapper = (Wrapper) container.findChild(wrapper.getName());
 if (wrapper == null) {
-error(response, HttpServletResponse.SC_NOT_FOUND);
+error(request, response, HttpServletResponse.SC_NOT_FOUND);
 return;
 }
 }
@@ -160,7 +169,8 @@ final class StandardContextValve
 container.getLogger().error(sm.getString(
 "standardContextValve.acknowledgeException"), ioe);
 request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, ioe);
-error(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+error(request, response,
+HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
 return;
 }
 
@@ -184,6 +194,18 @@ final class StandardContextValve
 // running request.
 StandardContext c = context;
 if (c != null && c.getState().isAvailable()) {
+// Error page processing
+response.setSuspended(false);
+
+Throwable t = (Throwable) request.getAttribute(
+RequestDispatcher.ERROR_EXCEPTION);
+
+if (t != null) {
+throwable(request, response, t);
+} else {
+status(request, response);
+

is this acceptor threadsafe?

[叶茂]

 /**
 * Server socket acceptor thread.
 */
protected class Acceptor implements Runnable {
/**
 * The background thread that listens for incoming TCP/IP connections 
and
 * hands them off to an appropriate processor.
 */
public void run() {
// Loop until we receive a shutdown command
while (running) {
// Loop if endpoint is paused
while (paused) {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
// Ignore
}
}
try {
// Accept the next incoming connection from the server 
socket
SocketChannel socket = serverSock.accept();
if we have more than 1 acceptors,will the statement of "serverSock.accept()" be 
theadsafe?

 

svn commit: r1157832 - /tomcat/trunk/test/org/apache/catalina/core/TestStandardContextValve.java

[markt]

Author: markt
Date: Mon Aug 15 13:03:34 2011
New Revision: 1157832

URL: http://svn.apache.org/viewvc?rev=1157832&view=rev
Log:
Attempt to fix timing issues on Linux unit tests

Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextValve.java

Modified: 
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextValve.java?rev=1157832&r1=1157831&r2=1157832&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardContextValve.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContextValve.java 
Mon Aug 15 13:03:34 2011
@@ -70,6 +70,9 @@ public class TestStandardContextValve ex
 int rc = getUrl("http://localhost:"; + getPort() + "/invalid",
 new ByteChunk(), null);
 
+tomcat.stop();
+tomcat.destroy();
+
 assertEquals(Response.SC_NOT_FOUND, rc);
 assertEquals("InitErrorDestroy", trace.toString());
 }



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

svn commit: r1157834 - /tomcat/trunk/test/org/apache/catalina/core/TestStandardContextValve.java

[markt]

Author: markt
Date: Mon Aug 15 13:14:12 2011
New Revision: 1157834

URL: http://svn.apache.org/viewvc?rev=1157834&view=rev
Log:
Better fix for timing issues on Linux with unit tests

Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextValve.java

Modified: 
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextValve.java?rev=1157834&r1=1157833&r2=1157834&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardContextValve.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContextValve.java 
Mon Aug 15 13:14:12 2011
@@ -70,8 +70,16 @@ public class TestStandardContextValve ex
 int rc = getUrl("http://localhost:"; + getPort() + "/invalid",
 new ByteChunk(), null);
 
-tomcat.stop();
-tomcat.destroy();
+// Need to allow time (but not too long in case the test fails) for
+// ServletRequestListener to complete
+int i = 20;
+while (i > 0) {
+if (trace.toString().endsWith("Destroy")) {
+break;
+}
+Thread.sleep(250);
+i--;
+}
 
 assertEquals(Response.SC_NOT_FOUND, rc);
 assertEquals("InitErrorDestroy", trace.toString());



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

svn commit: r1157847 - /tomcat/trunk/test/org/apache/catalina/core/TestStandardContextValve.java

[markt]

Author: markt
Date: Mon Aug 15 13:52:18 2011
New Revision: 1157847

URL: http://svn.apache.org/viewvc?rev=1157847&view=rev
Log:
Also seeing similar failures with NIO & APR

Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextValve.java

Modified: 
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextValve.java?rev=1157847&r1=1157846&r2=1157847&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardContextValve.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContextValve.java 
Mon Aug 15 13:52:18 2011
@@ -121,6 +121,17 @@ public class TestStandardContextValve ex
 int rc = getUrl("http://localhost:"; + getPort() + "/test",
 new ByteChunk(), null);
 
+// Need to allow time (but not too long in case the test fails) for
+// ServletRequestListener to complete
+int i = 20;
+while (i > 0) {
+if (trace.toString().endsWith("Destroy")) {
+break;
+}
+Thread.sleep(250);
+i--;
+}
+
 assertEquals(Response.SC_NOT_FOUND, rc);
 assertEquals("InitErrorDestroy", trace.toString());
 }



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

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

[jfclere]

Author: jfclere
Date: Mon Aug 15 14:05:12 2011
New Revision: 1157852

URL: http://svn.apache.org/viewvc?rev=1157852&view=rev
Log:
Remove my proposal... It needs more work.

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=1157852&r1=1157851&r2=1157852&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Aug 15 14:05:12 2011
@@ -103,13 +103,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 truncated cookies.
-  Based on https://issues.jboss.org/browse/JBWEB-196
-  http://people.apache.org/~jfclere/patches/patch.110622.txt
-  +1: jfclere
-  -1: markt Should use same mechanism for this as Tomcat 7 
-  -1
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51515
   Prevent immediate socket close when comet is used over HTTPS
   http://people.apache.org/~markt/patches/2011-07-22-bug51515-tc6.patch



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

svn commit: r1157853 - /tomcat/tc6.0.x/trunk/build.properties.default

[jfclere]

Author: jfclere
Date: Mon Aug 15 14:11:04 2011
New Revision: 1157853

URL: http://svn.apache.org/viewvc?rev=1157853&view=rev
Log:
Ready for release.

Modified:
tomcat/tc6.0.x/trunk/build.properties.default

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1157853&r1=1157852&r2=1157853&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Mon Aug 15 14:11:04 2011
@@ -27,9 +27,10 @@
 # - Version Control Flags -
 version.major=6
 version.minor=0
-version.build=0
+version.build=33
 version.patch=0
 version.suffix=-dev
+version=6.0.33
 
 # - Default Base Path for Dependent Packages -
 # Please note this path must be absolute, not relative,



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

svn commit: r1157855 - /tomcat/tc6.0.x/tags/TOMCAT_6_0_33/

[jfclere]

Author: jfclere
Date: Mon Aug 15 14:12:40 2011
New Revision: 1157855

URL: http://svn.apache.org/viewvc?rev=1157855&view=rev
Log:
Release 6.0.33

Added:
tomcat/tc6.0.x/tags/TOMCAT_6_0_33/   (props changed)
  - copied from r1157854, tomcat/tc6.0.x/trunk/

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_33/
--
--- svn:ignore (added)
+++ svn:ignore Mon Aug 15 14:12:40 2011
@@ -0,0 +1,7 @@
+.classpath
+.project
+.settings
+output
+build.properties
+work
+logs

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_33/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Aug 15 14:12:40 2011
@@ -0,0 +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



-
To unsu

svn commit: r1157860 - /tomcat/trunk/java/org/apache/catalina/core/StandardContext.java

[markt]

Author: markt
Date: Mon Aug 15 14:25:05 2011
New Revision: 1157860

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

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

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1157860&r1=1157859&r2=1157860&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Mon Aug 15 
14:25:05 2011
@@ -5871,24 +5871,6 @@ public class StandardContext extends Con
 
 
 /**
- * Get app base.
- */
-protected String getAppBase() {
-String appBase = null;
-Container container = this;
-while (container != null) {
-if (container instanceof Host)
-break;
-container = container.getParent();
-}
-if (container != null) {
-appBase = ((Host) container).getAppBase();
-}
-return appBase;
-}
-
-
-/**
  * Get naming context full name.
  */
 private String getNamingContextName() {



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

Re: is this acceptor threadsafe?

[Filip Hanik - Dev Lists]

On 8/15/2011 6:34 AM, Ҷï wrote:

  /**
  * Server socket acceptor thread.
  */
 protected class Acceptor implements Runnable {
 /**
  * The background thread that listens for incoming TCP/IP connections 
and
  * hands them off to an appropriate processor.
  */
 public void run() {
 // Loop until we receive a shutdown command
 while (running) {
 // Loop if endpoint is paused
 while (paused) {
 try {
 Thread.sleep(1000);
 } catch (InterruptedException e) {
 // Ignore
 }
 }
 try {
 // Accept the next incoming connection from the server 
socket
 SocketChannel socket = serverSock.accept();
if we have more than 1 acceptors,will the statement of "serverSock.accept()" be 
theadsafe?

yes, and serverSock.accept will lock, so there is no need for more than one 
acceptor thread, more than one thread will just queue up on the lock






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

svn commit: r1157869 - /tomcat/tc6.0.x/tags/TOMCAT_6_0_33/

[jfclere]

Author: jfclere
Date: Mon Aug 15 15:00:08 2011
New Revision: 1157869

URL: http://svn.apache.org/viewvc?rev=1157869&view=rev
Log:
Oops a bit too early.

Removed:
tomcat/tc6.0.x/tags/TOMCAT_6_0_33/


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

svn commit: r1157872 - /tomcat/tc7.0.x/trunk/RELEASE-NOTES

[markt]

Author: markt
Date: Mon Aug 15 15:03:57 2011
New Revision: 1157872

URL: http://svn.apache.org/viewvc?rev=1157872&view=rev
Log:
Not planning any Comet API removals

Modified:
tomcat/tc7.0.x/trunk/RELEASE-NOTES

Modified: tomcat/tc7.0.x/trunk/RELEASE-NOTES
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/RELEASE-NOTES?rev=1157872&r1=1157871&r2=1157872&view=diff
==
--- tomcat/tc7.0.x/trunk/RELEASE-NOTES (original)
+++ tomcat/tc7.0.x/trunk/RELEASE-NOTES Mon Aug 15 15:03:57 2011
@@ -65,6 +65,7 @@ The public interfaces for the following 
 resolve bugs and/or add new features. No existing interface will be removed or
 changed although it may be deprecated.
 - org/apache/catalina/*
+- org/apache/catalina/comet/*
 
 Note: As Tomcat 7 matures, the above list will be added to. The list is not
   considered complete at this time.



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

svn commit: r1157874 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java

[fhanik]

Author: fhanik
Date: Mon Aug 15 15:06:35 2011
New Revision: 1157874

URL: http://svn.apache.org/viewvc?rev=1157874&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51583

Modified:

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1157874&r1=1157873&r2=1157874&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 Mon Aug 15 15:06:35 2011
@@ -364,7 +364,9 @@ public class ConnectionPool {
 release(con);
 else
 abandon(con);
-con = pool.poll(1000, TimeUnit.MILLISECONDS);
+if (pool.size()>0) {
+con = pool.poll(1000, TimeUnit.MILLISECONDS);
+}
 } //while
 } catch (InterruptedException ex) {
 Thread.interrupted();



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

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

[fhanik]

Author: fhanik
Date: Mon Aug 15 15:19:33 2011
New Revision: 1157884

URL: http://svn.apache.org/viewvc?rev=1157884&view=rev
Log:
update doco for bug fix

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=1157884&r1=1157883&r2=1157884&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Aug 15 15:19:33 2011
@@ -54,6 +54,13 @@
   issues to not "pop up" wrt. others).
 -->
 
+  
+
+  
+115787451583: Fix shutdown delay  (fhanik)
+  
+
+
   
 
   



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

DO NOT REPLY [Bug 51583] ConnectionPool.close() always waits one second unnecessarily

[bugzilla]

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

Filip Hanik  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Filip Hanik  2011-08-15 15:19:48 UTC ---
Fixed in r1157874

-- 
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: r1157904 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/StandardContextValve.java java/org/apache/catalina/core/StandardHostValve.java test/org/apache/catalina/core/TestStand

[markt]

Author: markt
Date: Mon Aug 15 16:36:27 2011
New Revision: 1157904

URL: http://svn.apache.org/viewvc?rev=1157904&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51653
Move application level error page handling from the Host to the Context. This 
ensures that application error page handling is completed before the 
requestDestroyed event of any ServletRequestListener is fired.

Added:

tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardContextValve.java
  - copied, changed from r1157810, 
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextValve.java
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContextValve.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 15 16:36:27 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157810,1157832,1157834,1157847

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContextValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContextValve.java?rev=1157904&r1=1157903&r2=1157904&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContextValve.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContextValve.java 
Mon Aug 15 16:36:27 2011
@@ -21,16 +21,24 @@ package org.apache.catalina.core;
 
 import java.io.IOException;
 
+import javax.servlet.DispatcherType;
 import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.catalina.Container;
+import org.apache.catalina.Context;
 import org.apache.catalina.Wrapper;
 import org.apache.catalina.comet.CometEvent;
+import org.apache.catalina.connector.ClientAbortException;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
+import org.apache.catalina.deploy.ErrorPage;
 import org.apache.catalina.valves.ValveBase;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.ExceptionUtils;
 import org.apache.tomcat.util.buf.MessageBytes;
 
 /**
@@ -44,8 +52,9 @@ import org.apache.tomcat.util.buf.Messag
  * @version $Id$
  */
 
-final class StandardContextValve
-extends ValveBase {
+final class StandardContextValve extends ValveBase {
+
+private static final Log log = LogFactory.getLog(StandardHostValve.class);
 
 //-- Constructor
 public StandardContextValve() {
@@ -112,10 +121,10 @@ final class StandardContextValve
 // Disallow any direct access to resources under WEB-INF or META-INF
 MessageBytes requestPathMB = request.getRequestPathMB();
 if ((requestPathMB.startsWithIgnoreCase("/META-INF/", 0))
-|| (requestPathMB.equalsIgnoreCase("/META-INF"))
-|| (requestPathMB.startsWithIgnoreCase("/WEB-INF/", 0))
-|| (requestPathMB.equalsIgnoreCase("/WEB-INF"))) {
-error(response, HttpServletResponse.SC_NOT_FOUND);
+|| (requestPathMB.equalsIgnoreCase("/META-INF"))
+|| (requestPathMB.startsWithIgnoreCase("/WEB-INF/", 0))
+|| (requestPathMB.equalsIgnoreCase("/WEB-INF"))) {
+error(request, response, HttpServletResponse.SC_NOT_FOUND);
 return;
 }
 
@@ -142,13 +151,13 @@ final class StandardContextValve
 // Select the Wrapper to be used for this Request
 Wrapper wrapper = request.getWrapper();
 if (wrapper == null) {
-error(response, HttpServletResponse.SC_NOT_FOUND);
+error(request, response, HttpServletResponse.SC_NOT_FOUND);
 return;
 } else if (wrapper.isUnavailable()) {
 // May be as a result of a reload, try and find the new wrapper
 wrapper = (Wrapper) container.findChild(wrapper.getName());
 if (wrapper == null) {
-error(response, HttpServletResponse.SC_NOT_FOUND);
+error(request, response, HttpServletResponse.SC_NOT_FOUND);
 return;
 }
 }
@@ -160,7 +169,8 @@ final class StandardContextValve
 container.getLogger().error(sm.getString(
 "standardContextValve.acknowledgeException"), ioe);
 request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, ioe);
-error(response, HttpServletResponse.SC_INTERNAL_SERVER_ERR

svn commit: r1157908 - /tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java

[markt]

Author: markt
Date: Mon Aug 15 16:53:42 2011
New Revision: 1157908

URL: http://svn.apache.org/viewvc?rev=1157908&view=rev
Log:
Fix benchmark tests

Modified:
tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java

Modified: tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java?rev=1157908&r1=1157907&r2=1157908&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java (original)
+++ tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java Mon Aug 15 
16:53:42 2011
@@ -72,7 +72,11 @@ public class Benchmarks {
 
 // Create a default session manager
 StandardManager mgr = new StandardManager();
-mgr.startInternal();
+try {
+mgr.startInternal();
+} catch (LifecycleException e) {
+// Ignore - this is expected
+}
 mgr.generateSessionId();
 while (mgr.sessionCreationTiming.size() <
 ManagerBase.TIMING_STATS_CACHE_SIZE) {
@@ -164,7 +168,11 @@ public class Benchmarks {
 
 // Create a default session manager
 StandardManager mgr = new StandardManager();
-mgr.startInternal();
+try {
+mgr.startInternal();
+} catch (LifecycleException e) {
+// Ignore - this is expected
+}
 mgr.setContainer(new StandardContext());
 mgr.generateSessionId();
 while (mgr.sessionCreationTiming.size() <



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

svn commit: r1157909 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/session/Benchmarks.java

[markt]

Author: markt
Date: Mon Aug 15 16:54:51 2011
New Revision: 1157909

URL: http://svn.apache.org/viewvc?rev=1157909&view=rev
Log:
Fix benchmark tests

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/Benchmarks.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 15 16:54:51 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157810,1157832,1157834,1157847
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157810,1157832,1157834,1157847,1157908

Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/Benchmarks.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/Benchmarks.java?rev=1157909&r1=1157908&r2=1157909&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/Benchmarks.java 
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/Benchmarks.java Mon 
Aug 15 16:54:51 2011
@@ -72,7 +72,11 @@ public class Benchmarks {
 
 // Create a default session manager
 StandardManager mgr = new StandardManager();
-mgr.startInternal();
+try {
+mgr.startInternal();
+} catch (LifecycleException e) {
+// Ignore - this is expected
+}
 mgr.generateSessionId();
 while (mgr.sessionCreationTiming.size() <
 ManagerBase.TIMING_STATS_CACHE_SIZE) {
@@ -164,7 +168,11 @@ public class Benchmarks {
 
 // Create a default session manager
 StandardManager mgr = new StandardManager();
-mgr.startInternal();
+try {
+mgr.startInternal();
+} catch (LifecycleException e) {
+// Ignore - this is expected
+}
 mgr.setContainer(new StandardContext());
 mgr.generateSessionId();
 while (mgr.sessionCreationTiming.size() <



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

DO NOT REPLY [Bug 51653] ServletRequestListener.requestDestroyed is called before request leaves a webapp

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mark Thomas  2011-08-15 17:08:35 UTC ---
This has been fixed in trunk and 7.0.x and will be included in 7.0.21 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 51653] ServletRequestListener.requestDestroyed is called before request leaves a webapp

[bugzilla]

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

--- Comment #2 from wheleph  2011-08-15 17:35:46 UTC ---
Thanks for the prompt fix! I think it's also worth including in Tomcat 6 which
is widely used now because this seems to be inaccuracy in implementation of
Servlet specification. How do you think?

-- 
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 50353] Calling asyncContext.getResponse() returns null after async timeout

[bugzilla]

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

--- Comment #5 from David  2011-08-15 18:32:35 UTC ---
It now throws IllegalStateException which is an unchecked exception.

I don't think i'm splitting hairs here, that I strongly believe it should be
throwing a checked exception.

Maybe there's a deficiency with the API, but in the application code, there's
no way that I know to handle this case properly without handling the unchecked
exception (an unchecked exception is supposed to be a bug e.g.
nullpointerException).

The asyncContext error/timeout handler cannot be atomically synchronized with
the causal event so in a Thread race between error/timout and writing a
response it is possible to get this unchecked exsception and there is no proper
way to write the code.

So really it has to ba a checked exception, and the API altered if necessary.

-- 
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 50353] Calling asyncContext.getResponse() returns null after async timeout

[bugzilla]

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

--- Comment #6 from Mark Thomas  2011-08-15 18:37:30 UTC ---
NPE is also unchecked so the end result is the same and now there is a clearer
explanation of what went wrong.

Any API changes will require a change to the Servlet specification. For that,
you'll need to lobby the Servlet EG. It is on my list of issues to raise but it
won't hurt if you raise it first.

-- 
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: r1157939 - in /tomcat/trunk/java/org/apache/catalina/startup: HostConfig.java LocalStrings.properties LocalStrings_es.properties LocalStrings_ja.properties

[markt]

Author: markt
Date: Mon Aug 15 18:38:16 2011
New Revision: 1157939

URL: http://svn.apache.org/viewvc?rev=1157939&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51654
Log an error message if an appBase is specified that is not a directory and 
disable automatic deployment to prevent subsequent errors.

Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_ja.properties

Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1157939&r1=1157938&r2=1157939&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Mon Aug 15 
18:38:16 2011
@@ -1318,6 +1318,13 @@ public class HostConfig
 }
 }
 
+if (!appBase().isDirectory()) {
+log.error(sm.getString(
+"hostConfig.appBase", host.getName(), 
appBase().getPath()));
+host.setDeployOnStartup(false);
+host.setAutoDeploy(false);
+}
+
 if (host.getDeployOnStartup())
 deployApps();
 

Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1157939&r1=1157938&r2=1157939&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Mon 
Aug 15 18:38:16 2011
@@ -72,7 +72,7 @@ engineConfig.stop=EngineConfig: Processi
 expandWar.copy=Error copying {0} to {1}
 expandWar.deleteFailed=[{0}] could not be completely deleted. The presence of 
the remaining files may cause problems
 expandWar.illegalPath=The archive [{0}] is malformed and will be ignored: an 
entry contains an illegal path [{1}] which was not expanded to [{2}] since that 
is outside of the defined docBase [{3}]
-hostConfig.appBase=Application base directory {0} does not exist
+hostConfig.appBase=Application base [{1}] for host [{0}] does not exist or is 
not a directory. deployOnStartUp and autoDeploy have been set to false to 
prevent deployment errors. Other errors may still occur.
 hostConfig.canonicalizing=Error delete redeploy resources from context [{0}]
 hostConfig.cce=Lifecycle event data object {0} is not a Host
 hostConfig.context.remove=Error while removing context [{0}]

Modified: 
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties?rev=1157939&r1=1157938&r2=1157939&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties 
Mon Aug 15 18:38:16 2011
@@ -71,7 +71,6 @@ engineConfig.stop = "EngineConfig"\: Pro
 expandWar.copy = Error copiando {0} a {1}
 expandWar.deleteFailed = [{0}] no pudo ser completamente borrado. La presencia 
de los ficheros restantes puede causar problemas
 expandWar.illegalPath = The archive [{0}] is malformed and will be ignored\: 
an entry contains an illegal path [{1}] which was not expanded to [{2}] since 
that is outside of the defined docBase [{3}]
-hostConfig.appBase = No existe el directorio base de la aplicaci\u00F3n {0}
 hostConfig.canonicalizing = Error al borrar redespliegue de recursos desde 
contexto [{0}]
 hostConfig.cce = El objeto de los datos de evento de ciclo de vida (Lifecycle 
event data object) {0} no es una m\u00E1quina (host)
 hostConfig.context.remove = Error al quitar contexto [{0}]

Modified: 
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_ja.properties?rev=1157939&r1=1157938&r2=1157939&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_ja.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_ja.properties 
Mon Aug 15 18:38:16 2011
@@ -35,7 +35,6 @@ embedded.noEngines=\u307e\u3060\u30a8\u3
 
engineConfig.cce=\u30e9\u30a4\u30d5\u30b5\u30a4\u30af\u30eb\u30a4\u30d9\u30f3\u30c8\u30c7\u30fc\u30bf\u30aa\u30d6\u30b8\u30a7\u30af\u30c8
 {0} \u306f\u30a8\u30f3\u30b8\u30f3\u3067\u306f\u3042\u308a\u307e\u305b\u3093
 engineConfi

svn commit: r1157943 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/core/ java/org/apache/catalina/ha/deploy/ java/org/apache/catalina/manager/ java/org/apache/catalina/startup

[markt]

Author: markt
Date: Mon Aug 15 18:50:25 2011
New Revision: 1157943

URL: http://svn.apache.org/viewvc?rev=1157943&view=rev
Log:
Clean-up I do not intend to back-port (non-critical and changes the Host API)

Modified:
tomcat/trunk/java/org/apache/catalina/Host.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/Host.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Host.java?rev=1157943&r1=1157942&r2=1157943&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Host.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Host.java Mon Aug 15 18:50:25 2011
@@ -16,6 +16,7 @@
  */
 package org.apache.catalina;
 
+import java.io.File;
 import java.util.regex.Pattern;
 
 
@@ -83,7 +84,7 @@ public interface Host extends Container 
  */
 public void setXmlBase(String xmlBase);
 
-/**
+/**
  * Return the application root for this Host.  This can be an absolute
  * pathname, a relative pathname, or a URL.
  */
@@ -91,6 +92,14 @@ public interface Host extends Container 
 
 
 /**
+ * Return an absolute {@link File} for the appBase of this Host. The file
+ * will be canonical if possible. There is no guarantee that that the
+ * appBase exists.
+ */
+public File getAppBaseFile();
+
+
+/**
  * Set the application root for this Host.  This can be an absolute
  * pathname, a relative pathname, or a URL.
  *

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1157943&r1=1157942&r2=1157943&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Mon Aug 15 
18:50:25 2011
@@ -5857,10 +5857,7 @@ public class StandardContext extends Con
 docBase = (new File(engineBase(), getDocBase())).getPath();
 } else {
 // Use the "appBase" property of this container
-String appBase = ((Host) container).getAppBase();
-file = new File(appBase);
-if (!file.isAbsolute())
-file = new File(engineBase(), appBase);
+file = ((Host) container).getAppBaseFile();
 docBase = (new File(file, getDocBase())).getPath();
 }
 } else {

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?rev=1157943&r1=1157942&r2=1157943&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java Mon Aug 15 
18:50:25 2011
@@ -17,6 +17,8 @@
 package org.apache.catalina.core;
 
 
+import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -26,6 +28,7 @@ import java.util.regex.Pattern;
 
 import org.apache.catalina.Container;
 import org.apache.catalina.Context;
+import org.apache.catalina.Globals;
 import org.apache.catalina.Host;
 import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleEvent;
@@ -82,6 +85,7 @@ public class StandardHost extends Contai
  * The application root for this Host.
  */
 private String appBase = "webapps";
+private volatile File appBaseFile = null;
 
 /**
  * The XML root for this Host.
@@ -186,23 +190,41 @@ 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.
- * If null, defaults to ${catalina.base}/conf/ directory
+ * ({@inheritDoc}
  */
 @Override
-public String getXmlBase() {
+public File getAppBaseFile() {
+
+if (appBaseFile != null) {
+return appBaseFile;
+}
 
-return (this.xm

DO NOT REPLY [Bug 50353] Calling asyncContext.getResponse() returns null after async timeout

[bugzilla]

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

--- Comment #7 from David  2011-08-15 18:51:00 UTC ---
Agreed - null is not specified (by the API) though it did provide a route in
setting a local var and then testing for null (assuming the reference passed
had volatile handling).

Though without API support (unlikely) the checked exception idea seems a better
way. Then the application code would handle it like e.g. java.io.IOException.

How do I "lobby the Servlet EG"?

-- 
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 50353] Calling asyncContext.getResponse() returns null after async timeout

[bugzilla]

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

--- Comment #8 from Mark Thomas  2011-08-15 18:53:33 UTC ---
http://java.net/projects/servlet-spec/lists and post to the users list.

-- 
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: r1157947 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Aug 15 18:56:59 2011
New Revision: 1157947

URL: http://svn.apache.org/viewvc?rev=1157947&view=rev
Log:
Correct location

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=1157947&r1=1157946&r2=1157947&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Aug 15 18:56:59 2011
@@ -54,13 +54,6 @@
   issues to not "pop up" wrt. others).
 -->
 
-  
-
-  
-115787451583: Fix shutdown delay  (fhanik)
-  
-
-
   
 
   
@@ -114,6 +107,14 @@
   
 
   
+  
+
+  
+115787451583: Fix jdbc-pool shutdown delay.
+(fhanik)
+  
+
+
 
 
   



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

svn commit: r1157949 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ webapps/docs/

[markt]

Author: markt
Date: Mon Aug 15 18:59:03 2011
New Revision: 1157949

URL: http://svn.apache.org/viewvc?rev=1157949&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51654
Log an error message if an appBase is specified that is not a directory and 
disable automatic deployment to prevent subsequent errors.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties

tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties

tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_ja.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 15 18:59:03 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157810,1157832,1157834,1157847,1157908
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157810,1157832,1157834,1157847,1157908,1157939

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1157949&r1=1157948&r2=1157949&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Mon 
Aug 15 18:59:03 2011
@@ -1318,6 +1318,13 @@ public class HostConfig
 }
 }
 
+if (!appBase().isDirectory()) {
+log.error(sm.getString(
+"hostConfig.appBase", host.getName(), 
appBase().getPath()));
+host.setDeployOnStartup(false);
+host.setAutoDeploy(false);
+}
+
 if (host.getDeployOnStartup())
 deployApps();
 

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1157949&r1=1157948&r2=1157949&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties 
Mon Aug 15 18:59:03 2011
@@ -72,7 +72,7 @@ engineConfig.stop=EngineConfig: Processi
 expandWar.copy=Error copying {0} to {1}
 expandWar.deleteFailed=[{0}] could not be completely deleted. The presence of 
the remaining files may cause problems
 expandWar.illegalPath=The archive [{0}] is malformed and will be ignored: an 
entry contains an illegal path [{1}] which was not expanded to [{2}] since that 
is outside of the defined docBase [{3}]
-hostConfig.appBase=Application base directory {0} does not exist
+hostConfig.appBase=Application base [{1}] for host [{0}] does not exist or is 
not a directory. deployOnStartUp and autoDeploy have been set to false to 
prevent deployment errors. Other errors may still occur.
 hostConfig.canonicalizing=Error delete redeploy resources from context [{0}]
 hostConfig.cce=Lifecycle event data object {0} is not a Host
 hostConfig.context.remove=Error while removing context [{0}]

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties?rev=1157949&r1=1157948&r2=1157949&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
 Mon Aug 15 18:59:03 2011
@@ -71,7 +71,6 @@ engineConfig.stop = "EngineConfig"\: Pro
 expandWar.copy = Error copiando {0} a {1}
 expandWar.deleteFailed = [{0}] no pudo ser completamente borrado. La presencia 
de los ficheros restantes puede causar problemas
 expandWar.illegalPath = The archive [{0}] is malformed and will be ignored\: 
an entry contains an illegal path [{1}] which was not expanded to [{2}] since 
that is outside of the defined docBase [{3}]
-hostConfig.appBase = No existe el directorio base de la aplicaci\u00F3n {0}
 hostConfig.canonicalizing = Error al borrar redespliegue de recursos desde 
contexto [{0}]
 hostConfig.cce = El objeto de los datos de evento de ciclo de vida (Lifecycle 
event data object) {0} no es una m\u00E1quina (host)
 hostConfig.context.remove = Error al quitar contexto [{0}]

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/t

DO NOT REPLY [Bug 51654] NullPointerException in startup (org.apache.catalina.startup.HostConfig.filterAppPaths) due to missing app base

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mark Thomas  2011-08-15 18:59:04 UTC ---
This has been fixed in trunk and 7.0.x and will be included in 7.0.21 onwards.

The fix logs an error message and disables automatic deployment if the appBase
is not a directory.

-- 
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 51656] NullPointerException in host-manager application (in javax.servlet.GenericServlet.getServletContext during logging)

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WORKSFORME

--- Comment #1 from Mark Thomas  2011-08-15 19:31:31 UTC ---
This works for me with the latest 7.0.x code and there have been no relevant
changes for as long as I can remember.

Looking at the stack trace suggests something very strange is going on with
your environment. Thsi looks like a broken install and/or config to me. The
users list is the place to seek 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