date:20160115

svn commit: r1724788 - in /tomcat/trunk: java/org/apache/catalina/core/ApplicationHttpRequest.java test/org/apache/catalina/core/TestApplicationHttpRequest.java webapps/docs/changelog.xml

2016-01-15 Thread kkolinko

Author: kkolinko
Date: Fri Jan 15 12:49:03 2016
New Revision: 1724788

URL: http://svn.apache.org/viewvc?rev=1724788=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58836
Followup. One needs to call queryMB.setCharset() to set encoding for the query 
string during parameter merging.

Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
tomcat/trunk/test/org/apache/catalina/core/TestApplicationHttpRequest.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java?rev=1724788=1724787=1724788=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java Fri 
Jan 15 12:49:03 2016
@@ -20,6 +20,7 @@ package org.apache.catalina.core;
 
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -39,6 +40,7 @@ import org.apache.catalina.Context;
 import org.apache.catalina.Globals;
 import org.apache.catalina.Manager;
 import org.apache.catalina.Session;
+import org.apache.tomcat.util.buf.B2CConverter;
 import org.apache.tomcat.util.buf.MessageBytes;
 import org.apache.tomcat.util.http.Parameters;
 
@@ -883,8 +885,20 @@ class ApplicationHttpRequest extends Htt
 Parameters paramParser = new Parameters();
 MessageBytes queryMB = MessageBytes.newInstance();
 queryMB.setString(queryParamString);
+
+String encoding = getCharacterEncoding();
+// No need to process null value, as ISO-8859-1 is the default encoding
+// in MessageBytes.toBytes().
+if (encoding != null) {
+try {
+queryMB.setCharset(B2CConverter.getCharset(encoding));
+} catch (UnsupportedEncodingException ignored) {
+// Fall-back to ISO-8859-1
+}
+}
+
 paramParser.setQuery(queryMB);
-paramParser.setQueryStringEncoding(getCharacterEncoding());
+paramParser.setQueryStringEncoding(encoding);
 paramParser.handleQueryParameters();
 
 // Copy the original parameters

Modified: 
tomcat/trunk/test/org/apache/catalina/core/TestApplicationHttpRequest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestApplicationHttpRequest.java?rev=1724788=1724787=1724788=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestApplicationHttpRequest.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestApplicationHttpRequest.java 
Fri Jan 15 12:49:03 2016
@@ -162,6 +162,19 @@ public class TestApplicationHttpRequest
 doQueryStringTest("a=b=e", "a", expected);
 }
 
+@Test
+public void testMergeQueryString05() throws Exception {
+// https://ru.wikipedia.org/wiki/%D0%A2%D0%B5%D1%81%D1%82
+// "Test" = "Test"
+String test = "\u0422\u0435\u0441\u0442";
+String query = test + "=%D0%A2%D0%B5%D1%81%D1%82";
+
+Map expected = new HashMap<>();
+expected.put("a", new String[] { "b" });
+expected.put(test, new String[] { test });
+doQueryStringTest("a=b", query, expected);
+}
+
 
 private void doQueryStringTest(String originalQueryString, String 
forwardQueryString,
 Map expected) throws Exception {
@@ -210,6 +223,7 @@ public class TestApplicationHttpRequest
 @Override
 protected void doGet(HttpServletRequest req, HttpServletResponse resp)
 throws ServletException, IOException {
+req.setCharacterEncoding("UTF-8");
 req.getRequestDispatcher(target).forward(req, resp);
 }
 }
@@ -228,6 +242,7 @@ public class TestApplicationHttpRequest
 @Override
 protected void doGet(HttpServletRequest req, HttpServletResponse resp)
 throws ServletException, IOException {
+req.setCharacterEncoding("UTF-8");
 resp.setContentType("text/plain");
 resp.setCharacterEncoding("UTF-8");
 PrintWriter w = resp.getWriter();

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1724788=1724787=1724788=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jan 15 12:49:03 2016
@@ -182,7 +182,7 @@
   
 58836: Correctly merge query string parameters when
 processing a forwarded request where the target includes a query

[Bug 58867] Having a context.xml in conf prevents redeployment on startup

2016-01-15 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=58867

--- Comment #1 from Konstantin Kolinko  ---
Please provide a step-by-step recipe to reproduce your issue
http://tomcat.apache.org/bugreport.html#How_to_write_a_bug_report

Your description is not clear.

-- 
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

[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed

2016-01-15 Thread Bill Barker

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc8.0.x-test-nio2 has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.0.x-test-nio2 :  Tomcat 8.x, a web server implementing the 
Java Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 55 mins 15 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160115-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160115.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160115-native-src.tar.gz
 -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true 
-Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20160115/bin
 /openssl -Dexecute.test.bio=false -Dexecute.test.apr=false 
-Dtest.excludePerformance=true -Dexecute.test.nio2=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build

svn commit: r1724792 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationHttpRequest.java test/org/apache/catalina/core/TestApplicationHttpRequest.java webapps/docs/changelog.xml

2016-01-15 Thread kkolinko

Author: kkolinko
Date: Fri Jan 15 12:58:14 2016
New Revision: 1724792

URL: http://svn.apache.org/viewvc?rev=1724792=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58836
Followup. One needs to call queryMB.setCharset() to set encoding for the query 
string during parameter merging.

Merged r1724788 from tomcat/trunk.

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

tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestApplicationHttpRequest.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 15 12:58:14 2016
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1
 
666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,168555

Early Access builds of JDK 8u76 b02, JDK 9 build b100 & build b99 for JDK 9 with Project Jigsaw are available on java.net

2016-01-15 Thread Rory O'Donnell



Hi Mark/Mladen,

Early Access b02  for JDK 8u76 is 
available on java.net, summary of  changes are listed here 
.


Early Access b100  for JDK 9 is 
available on java.net, summary of  changes are listed here 
.


Early Access b99  for JDK 9 with Project 
Jigsaw is available on java.net, summary of changes are listed here 
 .


Dalibor and I will be at FOSDEM '16, Brussels 30 & 31 January, link to 
our presentation here. 


Let us know if you will be there, hopefully we can meet up !

Rgds,Rory

--
Rgds,Rory O'Donnell
Quality Engineering Manager
Oracle EMEA , Dublin, Ireland

svn commit: r1724797 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationHttpRequest.java test/org/apache/catalina/core/TestApplicationHttpRequest.java webapps/docs/changelog.xml

2016-01-15 Thread kkolinko

Author: kkolinko
Date: Fri Jan 15 13:18:31 2016
New Revision: 1724797

URL: http://svn.apache.org/viewvc?rev=1724797=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58836
Followup. One needs to call queryMB.setCharset() to set encoding for the query 
string during parameter merging.

Merged r1724792 from tomcat/tc8.0.x/trunk.

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

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

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 15 13:18:31 2016
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114

svn commit: r1724801 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationHttpRequest.java webapps/docs/changelog.xml

2016-01-15 Thread kkolinko

Author: kkolinko
Date: Fri Jan 15 13:29:58 2016
New Revision: 1724801

URL: http://svn.apache.org/viewvc?rev=1724801=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58836
Followup. One needs to call queryMB.setCharset() to set encoding for the query 
string during parameter merging.

Merged r1724797 from tomcat/tc7.0.x/trunk.

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

tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 15 13:29:58 2016
@@ -1,3 +1,3 @@
-/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989
 
,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722801,1723151,1724435,1724553,1724675
-/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207,1716216-1716217,1716414,1717208-1717209,1720235,1720396,1720442,1720463,1721813,1721882,1722800,1723130,1724434,1724674
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,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,770
 
809,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,890139,890265

svn commit: r1724808 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationHttpRequest.java

2016-01-15 Thread kkolinko

Author: kkolinko
Date: Fri Jan 15 13:53:59 2016
New Revision: 1724808

URL: http://svn.apache.org/viewvc?rev=1724808=rev
Log:
For https://bz.apache.org/bugzilla/show_bug.cgi?id=58836
Optimize mergeValues(). The method arguments are known to be String[], so do 
that branch first. No functional change.

Backport of r1724806 from tomcat/tc7.0.x/trunk.

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

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

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 15 13:53:59 2016
@@ -1,3 +1,3 @@
-/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989
 
,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722801,1723151,1724435,1724553,1724675,1724797
-/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207,1716216-1716217,1716414,1717208-1717209,1720235,1720396,1720442,1720463,1721813,1721882,1722800,1723130,1724434,1724674,1724792
+/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989
 
,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722801,1723151,1724435,1724553,1724675,1724797,1724806
+/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207,1716216-1716217,1716414,1717208-1717209,1720235,1720396,1720442,1720463,1721813,1721882,1722800,1723130,1724434,1724674,1724792,1724803

svn commit: r1724812 [1/2] - in /tomcat/trunk/java/org/apache/jasper: ./ compiler/ compiler/tagplugin/ runtime/ security/ servlet/ tagplugins/jstl/ xmlparser/

2016-01-15 Thread remm

Author: remm
Date: Fri Jan 15 14:13:28 2016
New Revision: 1724812

URL: http://svn.apache.org/viewvc?rev=1724812=rev
Log:
Javadoc fixes.

Modified:
tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/trunk/java/org/apache/jasper/JasperException.java
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
tomcat/trunk/java/org/apache/jasper/Options.java
tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java
tomcat/trunk/java/org/apache/jasper/compiler/BeanRepository.java
tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
tomcat/trunk/java/org/apache/jasper/compiler/ELInterpreter.java
tomcat/trunk/java/org/apache/jasper/compiler/ELInterpreterFactory.java
tomcat/trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java
tomcat/trunk/java/org/apache/jasper/compiler/ErrorHandler.java
tomcat/trunk/java/org/apache/jasper/compiler/JarScannerFactory.java
tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java
tomcat/trunk/java/org/apache/jasper/compiler/ServletWriter.java
tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java
tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java
tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
tomcat/trunk/java/org/apache/jasper/runtime/JspSourceDependent.java
tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java
tomcat/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java
tomcat/trunk/java/org/apache/jasper/security/SecurityUtil.java
tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java
tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java
tomcat/trunk/java/org/apache/jasper/xmlparser/SymbolTable.java
tomcat/trunk/java/org/apache/jasper/xmlparser/XMLChar.java
tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
tomcat/trunk/java/org/apache/jasper/xmlparser/XMLString.java
tomcat/trunk/java/org/apache/jasper/xmlparser/XMLStringBuffer.java

Modified: tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java?rev=1724812=1724811=1724812=diff
==
--- tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java (original)
+++ tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java Fri Jan 15 
14:13:28 2016
@@ -471,6 +471,8 @@ public final class EmbeddedServletOption
 /**
  * Create an EmbeddedServletOptions object using data available from
  * ServletConfig and ServletContext.
+ * @param config The Servlet config
+ * @param context The Servlet context
  */
 public EmbeddedServletOptions(ServletConfig config,
 ServletContext context) {

Modified: tomcat/trunk/java/org/apache/jasper/JasperException.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JasperException.java?rev=1724812=1724811=1724812=diff
==
--- tomcat/trunk/java/org/apache/jasper/JasperException.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JasperException.java Fri Jan 15 
14:13:28 2016
@@ -33,16 +33,19 @@ public class JasperException extends jav
 
 /**
  * Creates a JasperException with the embedded exception and the reason for
- * throwing a JasperException
+ * throwing a JasperException.
+ * @param reason The exception message
+ * @param exception The root cause
  */
-public JasperException (String reason, Throwable exception) {
+public JasperException(String reason, Throwable exception) {
 super(reason, exception);
 }
 
 /**
- * Creates a JasperException with the embedded exception
+ * Creates a JasperException with the embedded exception.
+ * @param exception The root cause
  */
-public JasperException (Throwable exception) {
+public JasperException(Throwable exception) {
 super(exception);
 }
 }

Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1724812=1724811=1724812=diff

svn commit: r1724812 [2/2] - in /tomcat/trunk/java/org/apache/jasper: ./ compiler/ compiler/tagplugin/ runtime/ security/ servlet/ tagplugins/jstl/ xmlparser/

2016-01-15 Thread remm

Modified: tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java?rev=1724812=1724811=1724812=diff
==
--- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java (original)
+++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java Fri Jan 15 
14:13:28 2016
@@ -93,6 +93,8 @@ public class Util {
  * Returns true if our current URL is absolute,
  * false otherwise.
  * taken from org.apache.taglibs.standard.tag.common.core.ImportSupport
+ * @param url The URL
+ * @return true if the URL is absolute
  */
 public static boolean isAbsoluteUrl(String url){
 if(url == null){
@@ -117,6 +119,9 @@ public class Util {
  * Get the value associated with a content-type attribute.
  * Syntax defined in RFC 2045, section 5.1.
  * taken from org.apache.taglibs.standard.tag.common.core.Util
+ * @param input The attribute string
+ * @param name The attribute name
+ * @return the attribute value
  */
 public static String getContentTypeAttribute(String input, String name) {
 int begin;
@@ -150,6 +155,8 @@ public class Util {
  * and either EOS or a subsequent ';' (exclusive).
  *
  * taken from org.apache.taglibs.standard.tag.common.core.ImportSupport
+ * @param url The URL
+ * @return the URL without a user submitted session id parameter
  */
 public static String stripSession(String url) {
 StringBuilder u = new StringBuilder(url);
@@ -179,6 +186,8 @@ public class Util {
  * See also OutSupport.writeEscapedXml().
  *
  * taken from org.apache.taglibs.standard.tag.common.core.Util
+ * @param buffer Data to escape
+ * @return escaped data
  */
 public static String escapeXml(String buffer) {
 String result = escapeXml(buffer.toCharArray(), buffer.length());
@@ -224,8 +233,14 @@ public class Util {
 return escapedBuffer.toString();
 }
 
-/** Utility methods
+/**
+ * Utility methods
  * taken from org.apache.taglibs.standard.tag.common.core.UrlSupport
+ * @param url The URL
+ * @param context The context
+ * @param pageContext The page context
+ * @return the absolute URL
+ * @throws JspException If the URL doesn't start with '/'
  */
 public static String resolveUrl(
 String url, String context, PageContext pageContext)
@@ -293,7 +308,6 @@ public class Util {
 
 public ImportResponseWrapper(HttpServletResponse arg0) {
 super(arg0);
-// TODO Auto-generated constructor stub
 }
 
 @Override
@@ -314,13 +328,11 @@ public class Util {
 return sos;
 }
 
-/** Has no effect. */
 @Override
 public void setContentType(String x) {
 // ignore
 }
 
-/** Has no effect. */
 @Override
 public void setLocale(Locale x) {
 // ignore

Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java?rev=1724812=1724811=1724812=diff
==
--- tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java (original)
+++ tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java Fri Jan 15 
14:13:28 2016
@@ -33,440 +33,440 @@ import java.util.Hashtable;
  * encoding names used in XML instance documents must
  * be the IANA encoding names specified or one of the aliases for those names
  * which IANA defines.
- * 
+ * 
  *  Mapping of IANA encoding names and Java encoding names
  *  
- *  
- *  Common Name
+ *  
+ *  Common Name
  *  
- *  
- *  Use this name in XML files
+ *  
+ *  Use this name in XML files
  *  
- *  
- *  Name Type
+ *  
+ *  Name Type
  *  
- *  
- *  Xerces converts to this Java Encoder Name
+ *  
+ *  Xerces converts to this Java Encoder Name
  *  
  *  
  *  
- *  8 bit Unicode
- *  
- *  UTF-8
+ *  8 bit Unicode
+ *  
+ *  UTF-8
  *  
- *  
- *  IANA
+ *  
+ *  IANA
  *  
- *  
- *  UTF8
+ *  
+ *  UTF8
  *  
  *  
  *  
- *  ISO Latin 1
- *  
- *  ISO-8859-1
+ *  ISO Latin 1
+ *  
+ *  ISO-8859-1
  *  
- *  
- *  MIME
+ *  
+ *  MIME
  *  
- *  
- *  ISO-8859-1
+ *  
+ *  ISO-8859-1
  *  
  *  
  *  
- *  ISO Latin 2
- *  
- *  ISO-8859-2
+ *  ISO Latin 2
+ *  
+ *  ISO-8859-2
  *  
- *  
- *  MIME
+ *  
+ *  MIME
  *  
- *  
- *

svn commit: r1724806 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationHttpRequest.java

2016-01-15 Thread kkolinko

Author: kkolinko
Date: Fri Jan 15 13:48:52 2016
New Revision: 1724806

URL: http://svn.apache.org/viewvc?rev=1724806=rev
Log:
For https://bz.apache.org/bugzilla/show_bug.cgi?id=58836
Optimize mergeValues(). The method arguments are known to be String[], so do 
that branch first. No functional change.

Merged r1724803 from tomcat/tc8.0.x/trunk.

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

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 15 13:48:52 2016
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792
+/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553

svn commit: r1724803 - /tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java

2016-01-15 Thread kkolinko

Author: kkolinko
Date: Fri Jan 15 13:39:03 2016
New Revision: 1724803

URL: http://svn.apache.org/viewvc?rev=1724803=rev
Log:
For https://bz.apache.org/bugzilla/show_bug.cgi?id=58836
Optimize mergeValues(). The method arguments are known to be String[], so do 
that branch first. No functional change.

Modified:

tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java?rev=1724803=1724802=1724803=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java 
Fri Jan 15 13:39:03 2016
@@ -837,25 +837,23 @@ class ApplicationHttpRequest extends Htt
 
 if (values1 == null) {
 // Skip - nothing to merge
-} else if (values1 instanceof String)
-results.add(values1);
-else if (values1 instanceof String[]) {
-String values[] = (String[]) values1;
-for (int i = 0; i < values.length; i++)
-results.add(values[i]);
-} else
+} else if (values1 instanceof String[]) {
+for (String value : (String[]) values1) {
+results.add(value);
+}
+} else { // String
 results.add(values1.toString());
+}
 
 if (values2 == null) {
 // Skip - nothing to merge
-} else if (values2 instanceof String)
-results.add(values2);
-else if (values2 instanceof String[]) {
-String values[] = (String[]) values2;
-for (int i = 0; i < values.length; i++)
-results.add(values[i]);
-} else
+} else if (values2 instanceof String[]) {
+for (String value : (String[]) values2) {
+results.add(value);
+}
+} else { // String
 results.add(values2.toString());
+}
 
 String values[] = new String[results.size()];
 return results.toArray(values);



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

[Bug 58646] NullPointerException in InternalNioOutputBuffer

2016-01-15 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=58646

--- Comment #15 from Alexander Malyshev  ---
Ok, finally I was able to reproduce it with logs.
I associated ID with each request object and I added logging to
AbstractHttp11Processor  class to process() and recycle() methods.

In process() method I added the following log in the very beginning:

getLog().info("Starting to process request with id " + this.request.id + ".
Calling method is:\n" + java.lang.Thread.currentThread().getStackTrace()[3]);

and the following log later then request path is parsed (copying a few above
lines as well to make it clean):

if ((!getInputBuffer().parseRequestLine(this.keptAlive)) && 
  (handleIncompleteRequestLineRead()))
{
  break;
}

getLog().info("Processing " + this.request.method() + " request to " +
this.request.requestURI() + ".");

In the recycle() method I added log in the very beginning:

getLog().info("Recycling processor with id " + this.request.id + ". Calling
method is:\n" + java.lang.Thread.currentThread().getStackTrace()[2]);

What I got is that 2 different Tomcat threads started to process the same
request (logs are ordered properly):

Jan 15, 2016 MSK 04:52:13.914 PM http-nio-135.60.87.68-443-exec-23
org.apache.coyote.http11.Http11NioProcessor
INFO: Starting to process request with id 13. Calling method is:
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1500)

Jan 15, 2016 MSK 04:52:13.914 PM http-nio-135.60.87.68-443-exec-23
org.apache.coyote.http11.Http11NioProcessor
INFO: Processing POST request to /viewer/rest/live_viewer/.

Jan 15, 2016 MSK 04:52:13.914 PM http-nio-135.60.87.68-443-exec-17
org.apache.coyote.http11.Http11NioProcessor
INFO: Starting to process request with id 13. Calling method is:
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1500)

Jan 15, 2016 MSK 04:52:13.914 PM http-nio-135.60.87.68-443-exec-17
org.apache.coyote.http11.Http11NioProcessor
INFO: Processing POST request to /viewer/rest/live_viewer/.

Jan 15, 2016 MSK 04:52:13.914 PM http-nio-135.60.87.68-443-exec-17
org.apache.coyote.http11.Http11NioProcessor
INFO: Error parsing HTTP request header
 Note: further occurrences of HTTP header parsing errors will be logged at
DEBUG level.

java.lang.IllegalStateException: Unexpected state: headers already parsed.
Buffer not recycled?
at
org.apache.coyote.http11.AbstractNioInputBuffer.parseHeaders(AbstractNioInputBuffer.java:375)
at
org.apache.coyote.http11.AbstractHttp11Processor.process(AbstractHttp11Processor.java:1029)
at
org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:674)
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1500)
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1456)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at
org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
at java.lang.Thread.run(Thread.java:745)

Jan 15, 2016 MSK 04:52:13.914 PM http-nio-135.60.87.68-443-exec-23
com.avaya.acc.wcs.logic.api.GetPresentationTocCommand
INFO: Processing LIVE_VIEWER event for client with Participant ID null


Last log is aour app log and means that http-nio-135.60.87.68-443-exec-23
thread processed request successfully.
I think there is a synchronization issue somethere in tomcat code which makes
it possible for 2 threads to process the same request object simultaneously.

Here is another exception - but the reason seem to be the same:

Jan 15, 2016 MSK 04:52:14.028 PM http-nio-135.60.87.68-443-exec-16
org.apache.coyote.http11.Http11NioProcessor
INFO: Starting to process request with id 13. Calling method is:
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1500)

Jan 15, 2016 MSK 04:52:14.028 PM http-nio-135.60.87.68-443-exec-16
org.apache.coyote.http11.Http11NioProcessor
INFO: Processing GET request to /wcsws/WebSocket.

Jan 15, 2016 MSK 04:52:14.028 PM http-nio-135.60.87.68-443-exec-1
org.apache.coyote.http11.Http11NioProcessor
INFO: Starting to process request with id 13. Calling method is:
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1500)

Jan 15, 2016 MSK 04:52:14.029 PM http-nio-135.60.87.68-443-exec-1
org.apache.coyote.http11.Http11NioProcessor
INFO: Processing GET request to /wcsws/WebSocket.

Jan 15, 2016 MSK 04:52:14.029 PM http-nio-135.60.87.68-443-exec-1
org.apache.coyote.http11.Http11NioProcessor
INFO: Recycling processor with id 13. Calling method is:
org.apache.coyote.http11.Http11NioProtocol$Http11ConnectionHandler.release(Http11NioProtocol.java:218)

Jan 15, 2016 MSK 04:52:14.029 PM http-nio-135.60.87.68-443-exec-16

buildbot failure in ASF Buildbot on tomcat-8-trunk

2016-01-15 Thread buildbot

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1724792
Blamelist: kkolinko

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

[Bug 58721] Http11Nio2Protocol is leaking open file handles for TCP connections

2016-01-15 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=58721

--- Comment #1 from Remy Maucherat  ---
More information is needed on the scenario leading to the leak, since "normal"
resource processing doesn't cause it. Without these details, the issue will be
resolved as INVALID.

-- 
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: r1724814 - in /tomcat/tc6.0.x/branches/tomcat6-testing_20160106: ./ BRANCH-README.txt java/org/apache/catalina/core/ApplicationHttpRequest.java java/org/apache/tomcat/util/buf/MessageBytes

2016-01-15 Thread kkolinko

Author: kkolinko
Date: Fri Jan 15 14:16:08 2016
New Revision: 1724814

URL: http://svn.apache.org/viewvc?rev=1724814=rev
Log:
Rebase branch onto current tc6.0.x/trunk
This means a catch-up merge of all revisions up to r1724810.

Modified:
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/   (props changed)
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/BRANCH-README.txt

tomcat/tc6.0.x/branches/tomcat6-testing_20160106/java/org/apache/catalina/core/ApplicationHttpRequest.java

tomcat/tc6.0.x/branches/tomcat6-testing_20160106/java/org/apache/tomcat/util/buf/MessageBytes.java
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/branches/tomcat6-testing_20160106/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 15 14:16:08 2016
@@ -1,4 +1,4 @@
-/tomcat/tc6.0.x/trunk:1723244-1724610
-/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989
 
,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722801,1723151,1724435,1724553
-/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207,1716216-1716217,1716414,1717208-1717209,1720235,1720396,1720442,1720463,1721813,1721882,1722800,1723130,1724434
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,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,770
 
809,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,890139,890265

svn commit: r1724815 - /tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/core/TestApplicationHttpRequest.java

2016-01-15 Thread kkolinko

Author: kkolinko
Date: Fri Jan 15 14:20:16 2016
New Revision: 1724815

URL: http://svn.apache.org/viewvc?rev=1724815=rev
Log:
For https://bz.apache.org/bugzilla/show_bug.cgi?id=58836
Beackport the testcase for BZ 58836 from r1724797.

Modified:

tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/core/TestApplicationHttpRequest.java

Modified: 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/core/TestApplicationHttpRequest.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/core/TestApplicationHttpRequest.java?rev=1724815=1724814=1724815=diff
==
--- 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/core/TestApplicationHttpRequest.java
 (original)
+++ 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/core/TestApplicationHttpRequest.java
 Fri Jan 15 14:20:16 2016
@@ -164,6 +164,19 @@ public class TestApplicationHttpRequest
 doQueryStringTest("a=b=e", "a", expected);
 }
 
+@Test
+public void testMergeQueryString05() throws Exception {
+// https://ru.wikipedia.org/wiki/%D0%A2%D0%B5%D1%81%D1%82
+// "Test" = "Test"
+String test = "\u0422\u0435\u0441\u0442";
+String query = test + "=%D0%A2%D0%B5%D1%81%D1%82";
+
+Map expected = new HashMap();
+expected.put("a", new String[] { "b" });
+expected.put(test, new String[] { test });
+doQueryStringTest("a=b", query, expected);
+}
+
 
 private void doQueryStringTest(String originalQueryString, String 
forwardQueryString,
 Map expected) throws Exception {
@@ -220,6 +233,7 @@ public class TestApplicationHttpRequest
 @Override
 protected void doGet(HttpServletRequest req, HttpServletResponse resp)
 throws ServletException, IOException {
+req.setCharacterEncoding("UTF-8");
 req.getRequestDispatcher(target).forward(req, resp);
 }
 }
@@ -238,6 +252,7 @@ public class TestApplicationHttpRequest
 @Override
 protected void doGet(HttpServletRequest req, HttpServletResponse resp)
 throws ServletException, IOException {
+req.setCharacterEncoding("UTF-8");
 resp.setContentType("text/plain");
 resp.setCharacterEncoding("UTF-8");
 PrintWriter w = resp.getWriter();



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

svn commit: r1724863 - in /tomcat/trunk/java/org/apache/catalina: ./ ha/session/ manager/ session/

2016-01-15 Thread markt

Author: markt
Date: Fri Jan 15 17:40:18 2016
New Revision: 1724863

URL: http://svn.apache.org/viewvc?rev=1724863=rev
Log:
Refactoring
Make the session attribute distribution / filtering more consistent across the 
various Manager and Session implementation.
Differentiate between
- whether or not it is possible for an attribute to be distributed - 
Session.isAttributeDistributable()
- whether or not the Manager wants and attribute to be distributed - 
Manager.willAttributeDistribute

Modified:
tomcat/trunk/java/org/apache/catalina/Manager.java
tomcat/trunk/java/org/apache/catalina/Session.java
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/trunk/java/org/apache/catalina/manager/DummyProxySession.java
tomcat/trunk/java/org/apache/catalina/session/Constants.java
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/trunk/java/org/apache/catalina/session/StoreBase.java

Modified: tomcat/trunk/java/org/apache/catalina/Manager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Manager.java?rev=1724863=1724862=1724863=diff
==
--- tomcat/trunk/java/org/apache/catalina/Manager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Manager.java Fri Jan 15 17:40:18 2016
@@ -370,4 +370,18 @@ public interface Manager {
  * a method that executes periodic tasks, such as expiring sessions etc.
  */
 public void backgroundProcess();
+
+
+/**
+ * Would the Manager distribute the given session attribute? Manager
+ * implementations may provide additional configuration options to control
+ * which attributes are distributable.
+ *
+ * @param name  The attribute name
+ * @param value The attribute value
+ *
+ * @return {@code true} if the Manager would distribute the given attribute
+ * otherwise {@code false}
+ */
+public boolean willAttributeDistribute(String name, Object value);
 }

Modified: tomcat/trunk/java/org/apache/catalina/Session.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Session.java?rev=1724863=1724862=1724863=diff
==
--- tomcat/trunk/java/org/apache/catalina/Session.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Session.java Fri Jan 15 17:40:18 2016
@@ -356,4 +356,23 @@ public interface Session {
 boolean notifySessionListeners, boolean notifyContainerListeners);
 
 
+/**
+ * Does the session implementation support the distributing of the given
+ * attribute? If the Manager is marked as distributable, then this method
+ * must be used to check attributes before adding them to a session and
+ * an {@link IllegalArgumentException} thrown if the proposed attribute is
+ * not distributable.
+ * 
+ * Note that the {@link Manager} implementation may further restrict which
+ * attributes are distributed but a {@link Manager} level restriction 
should
+ * not trigger an {@link IllegalArgumentException} in
+ * {@link HttpSession#setAttribute(String, Object)}
+ *
+ * @param name  The attribute name
+ * @param value The attribute value
+ *
+ * @return {@code true} if distribution is supported, otherwise {@code
+ * false}
+ */
+public boolean isAttributeDistributable(String name, Object value);
 }

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=1724863=1724862=1724863=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java 
Fri Jan 15 17:40:18 2016
@@ -138,14 +138,25 @@ public abstract class ClusterManagerBase
  *
  * @param name The attribute name
  * @return true if the attribute should be distributed
+ *
+ * @deprecated Use {@link #willAttributeDistribute(String, Object)}. Will 
be
+ * removed in Tomcat 9.0.x
  */
+@Deprecated
 public boolean willAttributeDistribute(String name) {
+return willAttributeDistribute(name, null);
+}
+
+
+@Override
+public boolean willAttributeDistribute(String name, Object value) {
 if (sessionAttributePattern == null) {
 return true;
 }
 return sessionAttributePattern.matcher(name).matches();
 }
 
+
 public static ClassLoader[] getClassLoaders(Context context) {
 ClassLoader tccl = Thread.currentThread().getContextClassLoader();

svn commit: r1724845 - in /tomcat/trunk/java/org/apache: juli/ naming/ naming/factory/ tomcat/dbcp/dbcp2/ tomcat/dbcp/dbcp2/cpdsadapter/ tomcat/dbcp/dbcp2/datasources/

2016-01-15 Thread remm

Author: remm
Date: Fri Jan 15 16:00:25 2016
New Revision: 1724845

URL: http://svn.apache.org/viewvc?rev=1724845=rev
Log:
Javadoc fixes.

Modified:
tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
tomcat/trunk/java/org/apache/naming/NamingContext.java
tomcat/trunk/java/org/apache/naming/SelectorContext.java
tomcat/trunk/java/org/apache/naming/ServiceRef.java
tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java
tomcat/trunk/java/org/apache/naming/factory/SendMailFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java

tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java

tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingDriver.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/Utils.java

tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java

tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSource.java

tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSourceFactory.java

tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java

tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java

Modified: tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=1724845=1724844=1724845=diff
==
--- tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java (original)
+++ tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java Fri Jan 15 
16:00:25 2016
@@ -386,6 +386,7 @@ public class ClassLoaderLogManager exten
  *
  * @param classLoader The classloader for which we will retrieve or build 
the
  *configuration
+ * @return the log configuration
  */
 protected synchronized ClassLoaderLogInfo getClassLoaderInfo(ClassLoader 
classLoader) {
 
@@ -415,8 +416,8 @@ public class ClassLoaderLogManager exten
 /**
  * Read configuration for the specified classloader.
  *
- * @param classLoader
- * @throws IOException Error
+ * @param classLoader The classloader
+ * @throws IOException Error reading configuration
  */
 protected synchronized void readConfiguration(ClassLoader classLoader)
 throws IOException {
@@ -584,8 +585,8 @@ public class ClassLoaderLogManager exten
 /**
  * Set parent child relationship between the two specified loggers.
  *
- * @param logger
- * @param parent
+ * @param logger The logger
+ * @param parent The parent logger
  */
 protected static void doSetParentLogger(final Logger logger,
 final Logger parent) {

Modified: tomcat/trunk/java/org/apache/naming/NamingContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingContext.java?rev=1724845=1724844=1724845=diff
==
--- tomcat/trunk/java/org/apache/naming/NamingContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingContext.java Fri Jan 15 16:00:25 
2016
@@ -941,7 +941,7 @@ public class NamingContext implements Co
 
 
 /**
- * Returns true if writing is allowed on this context.
+ * @return true if writing is allowed on this context.
  */
 protected boolean isWritable() {
 return ContextAccessController.isWritable(name);
@@ -950,6 +950,9 @@ public class NamingContext implements Co
 
 /**
  * Throws a naming exception is Context is not writable.
+ * @return true if the Context is writable
+ * @throws NamingException if the Context is not writable and
+ *  exceptionOnFailedWrite is true
  */
 protected boolean checkWritable() throws NamingException {
 if (isWritable()) {

Modified: tomcat/trunk/java/org/apache/naming/SelectorContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/SelectorContext.java?rev=1724845=1724844=1724845=diff
==
--- tomcat/trunk/java/org/apache/naming/SelectorContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/SelectorContext.java Fri Jan 15 
16:00:25 2016
@@ -67,6 +67,7 @@ public class SelectorContext implements
 
 /**

svn commit: r1724904 - /tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/Tomcat.java

2016-01-15 Thread kkolinko

Author: kkolinko
Date: Sat Jan 16 00:43:58 2016
New Revision: 1724904

URL: http://svn.apache.org/viewvc?rev=1724904=rev
Log:
Update comment.
(From r1724903 of tomcat/tc7.0.x/trunk)

Modified:

tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/Tomcat.java

Modified: 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/Tomcat.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/Tomcat.java?rev=1724904=1724903=1724904=diff
==
--- 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/Tomcat.java
 (original)
+++ 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/Tomcat.java
 Sat Jan 16 00:43:58 2016
@@ -406,13 +406,12 @@ public class Tomcat {
 //if (connector != null) {
 //return connector;
 //}
-//// This will load Apr connector if available,
-//// default to nio. I'm having strange problems with apr
-//// XXX: jfclere weird... Don't add the AprLifecycleListener then.
-//// and for the use case the speed benefit wouldn't matter.
-//
+//
+//// The same as in standard Tomcat configuration.
+//// This creates an APR HTTP connector if AprLifecycleListener has 
been
+//// configured (created) and Tomcat Native library is available.
+//// Otherwise it creates a BIO HTTP connector (Http11Protocol).
 //connector = new Connector("HTTP/1.1");
-//// connector = new 
Connector("org.apache.coyote.http11.Http11Protocol"); 
 //connector.setPort(port);
 //service.addConnector( connector );
 //return connector;



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

svn commit: r1724909 - in /tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina: connector/TestConnector.java core/TestApplicationHttpRequest.java startup/TestTomcat.java startup/

2016-01-15 Thread kkolinko

Author: kkolinko
Date: Sat Jan 16 03:16:02 2016
New Revision: 1724909

URL: http://svn.apache.org/viewvc?rev=1724909=rev
Log:
Implement Tomcat class. Switch tests from using Embedded class to Tomcat class.

By the way, with this change I no longer see failures or crashes when testing 
with the APR connector. So this issue is fixed as well.

Modified:

tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/connector/TestConnector.java

tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/core/TestApplicationHttpRequest.java

tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java

tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/Tomcat.java

tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TomcatBaseTest.java

Modified: 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/connector/TestConnector.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/connector/TestConnector.java?rev=1724909=1724908=1724909=diff
==
--- 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/connector/TestConnector.java
 (original)
+++ 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/connector/TestConnector.java
 Sat Jan 16 03:16:02 2016
@@ -20,7 +20,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
 
-import org.apache.catalina.startup.Embedded;
+import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
 
 /**
@@ -30,10 +30,9 @@ public class TestConnector extends Tomca
 
 @Test
 public void testPort() throws Exception {
-Embedded tomcat = getTomcatInstance();
+Tomcat tomcat = getTomcatInstance();
 
-// Connector connector1 = tomcat.getConnector();
-Connector connector1 = tomcat.findConnectors()[0];
+Connector connector1 = tomcat.getConnector();
 connector1.setPort(0);
 
 tomcat.start();

Modified: 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/core/TestApplicationHttpRequest.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/core/TestApplicationHttpRequest.java?rev=1724909=1724908=1724909=diff
==
--- 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/core/TestApplicationHttpRequest.java
 (original)
+++ 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/core/TestApplicationHttpRequest.java
 Sat Jan 16 03:16:02 2016
@@ -31,8 +31,6 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import org.apache.catalina.Context;
-import org.apache.catalina.Host;
-import org.apache.catalina.startup.Embedded;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.tomcat.util.buf.ByteChunk;
@@ -180,17 +178,14 @@ public class TestApplicationHttpRequest
 
 private void doQueryStringTest(String originalQueryString, String 
forwardQueryString,
 Map expected) throws Exception {
-Embedded tomcat = getTomcatInstance();
+Tomcat tomcat = getTomcatInstance();
 
 // // No file system docBase required
 // Context ctx = tomcat.addContext("", null);
 
 // Must have a real docBase - just use temp
-// FIXME: Implement getHost() method. 
 // FIXME: Implement support for null docBase (r1681953)
-Host host = (Host) tomcat.getContainer().findChildren()[0];
-Tomcat helper = new Tomcat();
-Context ctx = helper.addContext(host, "",
+Context ctx = tomcat.addContext("",
 System.getProperty("java.io.tmpdir"));
 
 if (forwardQueryString == null) {

Modified: 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java?rev=1724909=1724908=1724909=diff
==
--- 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java
 (original)
+++ 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java
 Sat Jan 16 03:16:02 2016
@@ -248,18 +248,15 @@ public class TestTomcat extends TomcatBa
  */
 @Test
 public void testProgrammatic() throws Exception {
-Embedded tomcat = getTomcatInstance();
+Tomcat tomcat = getTomcatInstance();
 
 // // No file system docBase required
 // org.apache.catalina.Context ctx =

buildbot success in ASF Buildbot on tomcat-8-trunk

2016-01-15 Thread buildbot

The Buildbot has detected a restored build on builder tomcat-8-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-8-trunk/builds/405

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1724902
Blamelist: kkolinko

Build succeeded!

Sincerely,
 -The Buildbot




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

svn commit: r1724902 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/Tomcat.java

2016-01-15 Thread kkolinko

Author: kkolinko
Date: Sat Jan 16 00:35:55 2016
New Revision: 1724902

URL: http://svn.apache.org/viewvc?rev=1724902=rev
Log:
Update comment, removing an old XXX

Merged r1724900 from tomcat/trunk.

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

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 00:35:55 2016
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1
 
666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,168555

svn commit: r1724913 - in /tomcat/tc7.0.x/trunk/java/org/apache: catalina/core/StandardContext.java naming/resources/EmptyDirContext.java

2016-01-15 Thread kkolinko

Author: kkolinko
Date: Sat Jan 16 05:17:08 2016
New Revision: 1724913

URL: http://svn.apache.org/viewvc?rev=1724913=rev
Log:
For https://bz.apache.org/bugzilla/show_bug.cgi?id=57154
Review of r1681953
In EmptyDirContext.java:
- Remove @author tag from new code. The author is credited in the changelog.
- Use ImmutableNameNotFoundException as the cached exception instance.
Caching a plain NameNotFoundException is wrong, as it has a stacktrace. Such
pattern is a known source of PermGen memory leak, as staktrace keeps classes
and their classloaders in memory (see 
https://bz.apache.org/bugzilla/show_bug.cgi?id=50460 )

In StandardContext.java:
- Remove redundant docBase != null check from the second branch of an elif tree.
The null case is handled by the first branch.

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/EmptyDirContext.java

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1724913=1724912=1724913=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Sat 
Jan 16 05:17:08 2016
@@ -5377,13 +5377,15 @@ public class StandardContext extends Con
 if (log.isDebugEnabled())
 log.debug("Configuring default Resources");
 try {
-if (getDocBase() == null)
+String docBase = getDocBase();
+if (docBase == null) {
 setResources(new EmptyDirContext());
-else if ((getDocBase() != null) && 
(getDocBase().endsWith(".war")) &&
-(!(new File(getBasePath())).isDirectory()))
+} else if (docBase.endsWith(".war")
+&& !(new File(getBasePath())).isDirectory()) {
 setResources(new WARDirContext());
-else
+} else {
 setResources(new FileDirContext());
+}
 } catch (IllegalArgumentException e) {
 log.error(sm.getString("standardContext.resourcesInit"), e);
 ok = false;

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/EmptyDirContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/EmptyDirContext.java?rev=1724913=1724912=1724913=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/EmptyDirContext.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/EmptyDirContext.java 
Sat Jan 16 05:17:08 2016
@@ -42,8 +42,6 @@ import javax.naming.directory.SearchResu
  * embedded mode when the web application is configured entirely
  * programmatically and does not use any static resources from the file system.
  * EmptyDirContext is implemented as a read only context.
- *
- * @author Huxing Zhang (huxing@alibaba-inc.com)
  */
 public class EmptyDirContext implements DirContext {
 
@@ -52,7 +50,7 @@ public class EmptyDirContext implements
  */
 private static final Attributes emptyAttributes = new BasicAttributes();
 
-private static final NameNotFoundException nameNotFoundException = new 
NameNotFoundException();
+private static final NameNotFoundException nameNotFoundException = new 
ImmutableNameNotFoundException();
 
 private static final Name emptyName = new CompositeName();
 



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

svn commit: r1724900 - /tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java

2016-01-15 Thread kkolinko

Author: kkolinko
Date: Sat Jan 16 00:25:24 2016
New Revision: 1724900

URL: http://svn.apache.org/viewvc?rev=1724900=rev
Log:
Update comment, removing an old XXX

Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1724900=1724899=1724900=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Sat Jan 16 
00:25:24 2016
@@ -419,11 +419,11 @@ public class Tomcat {
 if (connector != null) {
 return connector;
 }
-// This will load Apr connector if available,
-// default to nio. I'm having strange problems with apr
-// XXX: jfclere weird... Don't add the AprLifecycleListener then.
-// and for the use case the speed benefit wouldn't matter.
 
+// The same as in standard Tomcat configuration.
+// This creates an APR HTTP connector if AprLifecycleListener has been
+// configured (created) and Tomcat Native library is available.
+// Otherwise it creates a NIO HTTP connector.
 connector = new Connector("HTTP/1.1");
 connector.setPort(port);
 service.addConnector( connector );



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

svn commit: r1724907 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java

2016-01-15 Thread kkolinko

Author: kkolinko
Date: Sat Jan 16 02:46:01 2016
New Revision: 1724907

URL: http://svn.apache.org/viewvc?rev=1724907=rev
Log:
Add global constants for names of system properties "catalina.home", 
"catalina.base".
Ported from Tomcat 7.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java?rev=1724907=1724906=1724907=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java Sat Jan 16 
02:46:01 2016
@@ -360,6 +360,20 @@ public final class Globals {
 
 
 /**
+ * Name of the system property containing
+ * the Tomcat product installation path
+ */
+public static final String CATALINA_HOME_PROP = "catalina.home";
+
+
+/**
+ * Name of the system property containing
+ * the Tomcat instance installation path
+ */
+public static final String CATALINA_BASE_PROP = "catalina.base";
+
+
+/**
  * Name of the ServletContext init-param that determines if the JSP engine
  * should validate *.tld files when parsing them.
  * 



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

svn commit: r1724901 - /tomcat/trunk/java/org/apache/catalina/connector/Connector.java

2016-01-15 Thread kkolinko

Author: kkolinko
Date: Sat Jan 16 00:29:12 2016
New Revision: 1724901

URL: http://svn.apache.org/viewvc?rev=1724901=rev
Log:
Simplify implementation of Commector.setProtocol()
- swap outer and inner if()
- consistent handling of null value

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

Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1724901=1724900=1724901=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Sat Jan 16 
00:29:12 2016
@@ -586,29 +586,23 @@ public class Connector extends Lifecycle
  */
 public void setProtocol(String protocol) {
 
-if (AprLifecycleListener.isAprAvailable() && 
AprLifecycleListener.isAprPreferred()) {
-if ("HTTP/1.1".equals(protocol)) {
-setProtocolHandlerClassName
-("org.apache.coyote.http11.Http11AprProtocol");
-} else if ("AJP/1.3".equals(protocol)) {
-setProtocolHandlerClassName
-("org.apache.coyote.ajp.AjpAprProtocol");
-} else if (protocol != null) {
-setProtocolHandlerClassName(protocol);
+boolean aprConnector = AprLifecycleListener.isAprAvailable()
+&& AprLifecycleListener.isAprPreferred();
+
+if ("HTTP/1.1".equals(protocol) || protocol == null) {
+if (aprConnector) {
+
setProtocolHandlerClassName("org.apache.coyote.http11.Http11AprProtocol");
 } else {
-setProtocolHandlerClassName
-("org.apache.coyote.http11.Http11AprProtocol");
+
setProtocolHandlerClassName("org.apache.coyote.http11.Http11NioProtocol");
 }
-} else {
-if ("HTTP/1.1".equals(protocol)) {
-setProtocolHandlerClassName
-("org.apache.coyote.http11.Http11NioProtocol");
-} else if ("AJP/1.3".equals(protocol)) {
-setProtocolHandlerClassName
-("org.apache.coyote.ajp.AjpNioProtocol");
-} else if (protocol != null) {
-setProtocolHandlerClassName(protocol);
+} else if ("AJP/1.3".equals(protocol)) {
+if (aprConnector) {
+
setProtocolHandlerClassName("org.apache.coyote.ajp.AjpAprProtocol");
+} else {
+
setProtocolHandlerClassName("org.apache.coyote.ajp.AjpNioProtocol");
 }
+} else {
+setProtocolHandlerClassName(protocol);
 }
 
 }



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

svn commit: r1724903 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/Tomcat.java

2016-01-15 Thread kkolinko

Author: kkolinko
Date: Sat Jan 16 00:41:42 2016
New Revision: 1724903

URL: http://svn.apache.org/viewvc?rev=1724903=rev
Log:
Update comment, removing an old XXX

Merged r1724902 from tomcat/tc8.0.x/trunk:

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 00:41:42 2016
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114

svn commit: r1724908 - in /tomcat/tc6.0.x/branches/tomcat6-testing_20160106: ./ BRANCH-README.txt java/org/apache/catalina/Globals.java

2016-01-15 Thread kkolinko

Author: kkolinko
Date: Sat Jan 16 02:59:04 2016
New Revision: 1724908

URL: http://svn.apache.org/viewvc?rev=1724908=rev
Log:
Rebase branch onto current tc6.0.x/trunk
This means a catch-up merge of all revisions up to r1724907.

Modified:
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/   (props changed)
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/BRANCH-README.txt

tomcat/tc6.0.x/branches/tomcat6-testing_20160106/java/org/apache/catalina/Globals.java

Propchange: tomcat/tc6.0.x/branches/tomcat6-testing_20160106/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 02:59:04 2016
@@ -1,4 +1,4 @@
-/tomcat/tc6.0.x/trunk:1723244-1724810
+/tomcat/tc6.0.x/trunk:1723244-1724907
 
/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989
 
,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722801,1723151,1724435,1724553,1724675,1724797,1724806
 
/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207,1716216-1716217,1716414,1717208-1717209,1720235,1720396,1720442,1720463,1721813,1721882,1722800,1723130,1724434,1724674,1724792,1724803
 
/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,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,770
 
809,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,890139,890265

svn commit: r1724788 - in /tomcat/trunk: java/org/apache/catalina/core/ApplicationHttpRequest.java test/org/apache/catalina/core/TestApplicationHttpRequest.java webapps/docs/changelog.xml

[Bug 58867] Having a context.xml in conf prevents redeployment on startup

[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed

svn commit: r1724792 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationHttpRequest.java test/org/apache/catalina/core/TestApplicationHttpRequest.java webapps/docs/changelog.xml

Early Access builds of JDK 8u76 b02, JDK 9 build b100 & build b99 for JDK 9 with Project Jigsaw are available on java.net

svn commit: r1724797 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationHttpRequest.java test/org/apache/catalina/core/TestApplicationHttpRequest.java webapps/docs/changelog.xml

svn commit: r1724801 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationHttpRequest.java webapps/docs/changelog.xml

svn commit: r1724808 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationHttpRequest.java

svn commit: r1724812 [1/2] - in /tomcat/trunk/java/org/apache/jasper: ./ compiler/ compiler/tagplugin/ runtime/ security/ servlet/ tagplugins/jstl/ xmlparser/

svn commit: r1724812 [2/2] - in /tomcat/trunk/java/org/apache/jasper: ./ compiler/ compiler/tagplugin/ runtime/ security/ servlet/ tagplugins/jstl/ xmlparser/

svn commit: r1724806 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationHttpRequest.java

svn commit: r1724803 - /tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java

[Bug 58646] NullPointerException in InternalNioOutputBuffer

buildbot failure in ASF Buildbot on tomcat-8-trunk

[Bug 58721] Http11Nio2Protocol is leaking open file handles for TCP connections

svn commit: r1724814 - in /tomcat/tc6.0.x/branches/tomcat6-testing_20160106: ./ BRANCH-README.txt java/org/apache/catalina/core/ApplicationHttpRequest.java java/org/apache/tomcat/util/buf/MessageBytes

svn commit: r1724815 - /tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/core/TestApplicationHttpRequest.java

svn commit: r1724863 - in /tomcat/trunk/java/org/apache/catalina: ./ ha/session/ manager/ session/

svn commit: r1724845 - in /tomcat/trunk/java/org/apache: juli/ naming/ naming/factory/ tomcat/dbcp/dbcp2/ tomcat/dbcp/dbcp2/cpdsadapter/ tomcat/dbcp/dbcp2/datasources/

svn commit: r1724904 - /tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/Tomcat.java

svn commit: r1724909 - in /tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina: connector/TestConnector.java core/TestApplicationHttpRequest.java startup/TestTomcat.java startup/

buildbot success in ASF Buildbot on tomcat-8-trunk

svn commit: r1724902 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/Tomcat.java

svn commit: r1724913 - in /tomcat/tc7.0.x/trunk/java/org/apache: catalina/core/StandardContext.java naming/resources/EmptyDirContext.java

svn commit: r1724900 - /tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java

svn commit: r1724907 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java

svn commit: r1724901 - /tomcat/trunk/java/org/apache/catalina/connector/Connector.java

svn commit: r1724903 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/Tomcat.java

svn commit: r1724908 - in /tomcat/tc6.0.x/branches/tomcat6-testing_20160106: ./ BRANCH-README.txt java/org/apache/catalina/Globals.java

29 matches

Site Navigation

Mail list logo

Footer information