Author: kkolinko
Date: Fri Jun 27 15:50:05 2014
New Revision: 1606135
URL: http://svn.apache.org/r1606135
Log:
Followup to r1604472 for better compatibility.
Reintroduce setter methods removed by r1604472 and mark them deprecated.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1606135&r1=1606134&r2=1606135&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Fri Jun 27
15:50:05 2014
@@ -581,6 +581,18 @@ public class Request
return mappingData.context;
}
+ /**
+ * @param context The newly associated Context
+ * @deprecated Use setters on {@link #getMappingData() MappingData} object.
+ * Depending on use case, you may need to update other
+ * <code>MappingData</code> fields as well, such as
+ * <code>contextSlashCount</code> and <code>host</code>.
+ */
+ @Deprecated
+ public void setContext(Context context) {
+ mappingData.context = context;
+ }
+
/**
* Filter chain associated with the request.
@@ -702,6 +714,18 @@ public class Request
return mappingData.wrapper;
}
+ /**
+ * @param wrapper The newly associated Wrapper
+ * @deprecated Use setters on {@link #getMappingData() MappingData} object.
+ * Depending on use case, you may need to update other
+ * <code>MappingData</code> fields as well, such as <code>context</code>
+ * and <code>contextSlashCount</code>.
+ */
+ @Deprecated
+ public void setWrapper(Wrapper wrapper) {
+ mappingData.wrapper = wrapper;
+ }
+
// ------------------------------------------------- Request Public Methods
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1606135&r1=1606134&r2=1606135&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jun 27 15:50:05 2014
@@ -77,8 +77,8 @@
work in <code>Mapper</code>. (kkolinko)
</fix>
<scode>
- Remove <code>context</code> and <code>wrapper</code> fields and setters
- from <code>Request</code> class. (kkolinko)
+ Remove <code>context</code> and <code>wrapper</code> fields and
+ deprecate their setters in <code>Request</code> class. (kkolinko)
</scode>
<fix>
<bug>56665</bug>: Correct the generation of the effective web.xml when
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
