You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/04/27 22:23:37 UTC
svn commit: r1676367 - in /tomcat/tc8.0.x/trunk: ./
java/org/apache/catalina/connector/Response.java
Author: markt
Date: Mon Apr 27 20:23:37 2015
New Revision: 1676367
URL: http://svn.apache.org/r1676367
Log:
Use getter to access coyoteResponse to make it easier to sub-class.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Response.java
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 20:23:37 2015
@@ -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,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,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,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,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,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,1666496,1666552,1666569,1666579,1666637,1666649,1
666757,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
+/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,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,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,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,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,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,1666496,1666552,1666569,1666579,1666637,1666649,1
666757,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
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Response.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Response.java?rev=1676367&r1=1676366&r2=1676367&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Response.java Mon Apr 27 20:23:37 2015
@@ -321,7 +321,7 @@ public class Response
// Ignore - the client has probably closed the connection
}
}
- return coyoteResponse.getBytesWritten(flush);
+ return getCoyoteResponse().getBytesWritten(flush);
}
/**
@@ -458,7 +458,7 @@ public class Response
* Return the content length that was set or calculated for this Response.
*/
public int getContentLength() {
- return coyoteResponse.getContentLength();
+ return getCoyoteResponse().getContentLength();
}
@@ -468,7 +468,7 @@ public class Response
*/
@Override
public String getContentType() {
- return coyoteResponse.getContentType();
+ return getCoyoteResponse().getContentType();
}
@@ -525,7 +525,7 @@ public class Response
*/
@Override
public String getCharacterEncoding() {
- return (coyoteResponse.getCharacterEncoding());
+ return (getCoyoteResponse().getCharacterEncoding());
}
@@ -559,7 +559,7 @@ public class Response
*/
@Override
public Locale getLocale() {
- return (coyoteResponse.getLocale());
+ return (getCoyoteResponse().getLocale());
}
@@ -609,7 +609,7 @@ public class Response
*/
@Override
public boolean isCommitted() {
- return coyoteResponse.isCommitted();
+ return getCoyoteResponse().isCommitted();
}
@@ -626,7 +626,7 @@ public class Response
return;
}
- coyoteResponse.reset();
+ getCoyoteResponse().reset();
outputBuffer.reset();
usingOutputStream = false;
usingWriter = false;
@@ -723,7 +723,7 @@ public class Response
return;
}
- coyoteResponse.setContentLength(length);
+ getCoyoteResponse().setContentLength(length);
}
@@ -746,7 +746,7 @@ public class Response
}
if (type == null) {
- coyoteResponse.setContentType(null);
+ getCoyoteResponse().setContentType(null);
return;
}
@@ -754,16 +754,16 @@ public class Response
if (m == null) {
// Invalid - Assume no charset and just pass through whatever
// the user provided.
- coyoteResponse.setContentTypeNoCharset(type);
+ getCoyoteResponse().setContentTypeNoCharset(type);
return;
}
- coyoteResponse.setContentTypeNoCharset(m[0]);
+ getCoyoteResponse().setContentTypeNoCharset(m[0]);
if (m[1] != null) {
// Ignore charset if getWriter() has already been called
if (!usingWriter) {
- coyoteResponse.setCharacterEncoding(m[1]);
+ getCoyoteResponse().setCharacterEncoding(m[1]);
isCharacterEncodingSet = true;
}
}
@@ -795,7 +795,7 @@ public class Response
return;
}
- coyoteResponse.setCharacterEncoding(charset);
+ getCoyoteResponse().setCharacterEncoding(charset);
isCharacterEncodingSet = true;
}
@@ -818,7 +818,7 @@ public class Response
return;
}
- coyoteResponse.setLocale(locale);
+ getCoyoteResponse().setLocale(locale);
// Ignore any call made after the getWriter has been invoked.
// The default should be used
@@ -832,7 +832,7 @@ public class Response
String charset = getContext().getCharset(locale);
if (charset != null) {
- coyoteResponse.setCharacterEncoding(charset);
+ getCoyoteResponse().setCharacterEncoding(charset);
}
}
@@ -842,14 +842,14 @@ public class Response
@Override
public String getHeader(String name) {
- return coyoteResponse.getMimeHeaders().getHeader(name);
+ return getCoyoteResponse().getMimeHeaders().getHeader(name);
}
@Override
public Collection<String> getHeaderNames() {
- MimeHeaders headers = coyoteResponse.getMimeHeaders();
+ MimeHeaders headers = getCoyoteResponse().getMimeHeaders();
int n = headers.size();
List<String> result = new ArrayList<>(n);
for (int i = 0; i < n; i++) {
@@ -864,7 +864,7 @@ public class Response
public Collection<String> getHeaders(String name) {
Enumeration<String> enumeration =
- coyoteResponse.getMimeHeaders().values(name);
+ getCoyoteResponse().getMimeHeaders().values(name);
Vector<String> result = new Vector<>();
while (enumeration.hasMoreElements()) {
result.addElement(enumeration.nextElement());
@@ -878,13 +878,13 @@ public class Response
* for this Response.
*/
public String getMessage() {
- return coyoteResponse.getMessage();
+ return getCoyoteResponse().getMessage();
}
@Override
public int getStatus() {
- return coyoteResponse.getStatus();
+ return getCoyoteResponse().getStatus();
}
@@ -928,7 +928,7 @@ public class Response
final String startsWith = name + "=";
String header = generateCookieString(cookie);
boolean set = false;
- MimeHeaders headers = coyoteResponse.getMimeHeaders();
+ MimeHeaders headers = getCoyoteResponse().getMimeHeaders();
int n = headers.size();
for (int i = 0; i < n; i++) {
if (headers.getName(i).toString().equals(headername)) {
@@ -1027,7 +1027,7 @@ public class Response
return;
}
- coyoteResponse.addHeader(name, value, charset);
+ getCoyoteResponse().addHeader(name, value, charset);
}
@@ -1089,15 +1089,15 @@ public class Response
if(cc=='C' || cc=='c') {
if(name.equalsIgnoreCase("Content-Type")) {
// Will return null if this has not been set
- return (coyoteResponse.getContentType() != null);
+ return (getCoyoteResponse().getContentType() != null);
}
if(name.equalsIgnoreCase("Content-Length")) {
// -1 means not known and is not sent to client
- return (coyoteResponse.getContentLengthLong() != -1);
+ return (getCoyoteResponse().getContentLengthLong() != -1);
}
}
- return coyoteResponse.containsHeader(name);
+ return getCoyoteResponse().containsHeader(name);
}
@@ -1200,7 +1200,7 @@ public class Response
return;
}
- coyoteResponse.action(ActionCode.ACK, null);
+ getCoyoteResponse().action(ActionCode.ACK, null);
}
@@ -1245,8 +1245,8 @@ public class Response
setError();
- coyoteResponse.setStatus(status);
- coyoteResponse.setMessage(message);
+ getCoyoteResponse().setStatus(status);
+ getCoyoteResponse().setMessage(message);
// Clear any data content that has been buffered
resetBuffer();
@@ -1369,7 +1369,7 @@ public class Response
return;
}
- coyoteResponse.setHeader(name, value);
+ getCoyoteResponse().setHeader(name, value);
}
@@ -1434,8 +1434,8 @@ public class Response
return;
}
- coyoteResponse.setStatus(status);
- coyoteResponse.setMessage(message);
+ getCoyoteResponse().setStatus(status);
+ getCoyoteResponse().setMessage(message);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org