Author: kkolinko
Date: Thu Nov 10 08:53:39 2011
New Revision: 1200224
URL: http://svn.apache.org/viewvc?rev=1200224&view=rev
Log:
Merged revision 1200089 from tomcat/trunk:
Refactor special attribute names handling,
to use hash table lookup + adapter class, instead of series of name.equals()
tests.
Extracted add/change/remove notification delivery into separate methods.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 10 08:53:39 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187
753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,1199996,1200056,1200106-1200107
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187
753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,1199996,1200056,1200089,1200106-1200107
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1200224&r1=1200223&r2=1200224&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java Thu
Nov 10 08:53:39 2011
@@ -926,32 +926,10 @@ public class Request
@Override
public Object getAttribute(String name) {
- if (name.equals(Globals.DISPATCHER_TYPE_ATTR)) {
- return (internalDispatcherType == null)
- ? DispatcherType.REQUEST
- : internalDispatcherType;
- } else if (name.equals(Globals.DISPATCHER_REQUEST_PATH_ATTR)) {
- return (requestDispatcherPath == null)
- ? getRequestPathMB().toString()
- : requestDispatcherPath.toString();
- }
-
- if (name.equals(Globals.ASYNC_SUPPORTED_ATTR)) {
- return asyncSupported;
- }
-
- if (name.equals(Globals.GSS_CREDENTIAL_ATTR)) {
- if (userPrincipal instanceof GenericPrincipal) {
- return ((GenericPrincipal) userPrincipal).getGssCredential();
- }
- return null;
- }
-
- if (name.equals(Globals.PARAMETER_PARSE_FAILED_ATTR)) {
- if (coyoteRequest.getParameters().isParseFailed()) {
- return Boolean.TRUE;
- }
- return null;
+ // Special attributes
+ SpecialAttributeAdapter adapter = specialAttributes.get(name);
+ if (adapter != null) {
+ return adapter.get(this, name);
}
Object attr=attributes.get(name);
@@ -1475,9 +1453,6 @@ public class Request
*/
@Override
public void removeAttribute(String name) {
- Object value = null;
- boolean found = false;
-
// Remove the specified attribute
// Check for read only attribute
// requests are per thread so synchronization unnecessary
@@ -1490,37 +1465,16 @@ public class Request
coyoteRequest.getAttributes().remove(name);
}
- found = attributes.containsKey(name);
+ boolean found = attributes.containsKey(name);
if (found) {
- value = attributes.get(name);
+ Object value = attributes.get(name);
attributes.remove(name);
- } else {
- return;
- }
- // Notify interested application event listeners
- Object listeners[] = context.getApplicationEventListeners();
- if ((listeners == null) || (listeners.length == 0)) {
+ // Notify interested application event listeners
+ notifyAttributeRemoved(name, value);
+ } else {
return;
}
- ServletRequestAttributeEvent event =
- new ServletRequestAttributeEvent(context.getServletContext(),
- getRequest(), name, value);
- for (int i = 0; i < listeners.length; i++) {
- if (!(listeners[i] instanceof ServletRequestAttributeListener)) {
- continue;
- }
- ServletRequestAttributeListener listener =
- (ServletRequestAttributeListener) listeners[i];
- try {
- listener.attributeRemoved(event);
- } catch (Throwable t) {
- ExceptionUtils.handleThrowable(t);
-
context.getLogger().error(sm.getString("coyoteRequest.attributeEvent"), t);
- // Error valve will pick this exception up and display it to
user
- attributes.put(RequestDispatcher.ERROR_EXCEPTION, t);
- }
- }
}
@@ -1545,21 +1499,13 @@ public class Request
return;
}
- if (name.equals(Globals.DISPATCHER_TYPE_ATTR)) {
- internalDispatcherType = (DispatcherType)value;
- return;
- } else if (name.equals(Globals.DISPATCHER_REQUEST_PATH_ATTR)) {
- requestDispatcherPath = value;
+ // Special attributes
+ SpecialAttributeAdapter adapter = specialAttributes.get(name);
+ if (adapter != null) {
+ adapter.set(this, name, value);
return;
}
- if (name.equals(Globals.ASYNC_SUPPORTED_ATTR)) {
- this.asyncSupported = (Boolean)value;
- }
-
- Object oldValue = null;
- boolean replaced = false;
-
// Add or replace the specified attribute
// Check for read only attribute
// requests are per thread so synchronization unnecessary
@@ -1587,10 +1533,7 @@ public class Request
value = canonicalPath;
}
- oldValue = attributes.put(name, value);
- if (oldValue != null) {
- replaced = true;
- }
+ Object oldValue = attributes.put(name, value);
// Pass special attributes to the native layer
if (name.startsWith("org.apache.tomcat.")) {
@@ -1598,19 +1541,27 @@ public class Request
}
// Notify interested application event listeners
+ notifyAttributeAssigned(name, value, oldValue);
+ }
+
+
+ /**
+ * Notify interested listeners that attribute has been assigned a value.
+ */
+ private void notifyAttributeAssigned(String name, Object value,
+ Object oldValue) {
Object listeners[] = context.getApplicationEventListeners();
if ((listeners == null) || (listeners.length == 0)) {
return;
}
+ boolean replaced = (oldValue != null);
ServletRequestAttributeEvent event = null;
if (replaced) {
- event =
- new ServletRequestAttributeEvent(context.getServletContext(),
- getRequest(), name, oldValue);
+ event = new ServletRequestAttributeEvent(
+ context.getServletContext(), getRequest(), name, oldValue);
} else {
- event =
- new ServletRequestAttributeEvent(context.getServletContext(),
- getRequest(), name, value);
+ event = new ServletRequestAttributeEvent(
+ context.getServletContext(), getRequest(), name, value);
}
for (int i = 0; i < listeners.length; i++) {
@@ -1629,7 +1580,36 @@ public class Request
ExceptionUtils.handleThrowable(t);
context.getLogger().error(sm.getString("coyoteRequest.attributeEvent"), t);
// Error valve will pick this exception up and display it to
user
- attributes.put(RequestDispatcher.ERROR_EXCEPTION, t );
+ attributes.put(RequestDispatcher.ERROR_EXCEPTION, t);
+ }
+ }
+ }
+
+
+ /**
+ * Notify interested listeners that attribute has been removed.
+ */
+ private void notifyAttributeRemoved(String name, Object value) {
+ Object listeners[] = context.getApplicationEventListeners();
+ if ((listeners == null) || (listeners.length == 0)) {
+ return;
+ }
+ ServletRequestAttributeEvent event =
+ new ServletRequestAttributeEvent(context.getServletContext(),
+ getRequest(), name, value);
+ for (int i = 0; i < listeners.length; i++) {
+ if (!(listeners[i] instanceof ServletRequestAttributeListener)) {
+ continue;
+ }
+ ServletRequestAttributeListener listener =
+ (ServletRequestAttributeListener) listeners[i];
+ try {
+ listener.attributeRemoved(event);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+
context.getLogger().error(sm.getString("coyoteRequest.attributeEvent"), t);
+ // Error valve will pick this exception up and display it to
user
+ attributes.put(RequestDispatcher.ERROR_EXCEPTION, t);
}
}
}
@@ -3305,4 +3285,94 @@ public class Request
return true;
}
+
+ // ----------------------------------------------------- Special
attributes handling
+
+ private static interface SpecialAttributeAdapter {
+ Object get(Request request, String name);
+
+ void set(Request request, String name, Object value);
+
+ // None of special attributes support removal
+ // void remove(Request request, String name);
+ }
+
+ private static final Map<String, SpecialAttributeAdapter> specialAttributes
+ = new HashMap<String, SpecialAttributeAdapter>();
+
+ static {
+ specialAttributes.put(Globals.DISPATCHER_TYPE_ATTR,
+ new SpecialAttributeAdapter() {
+ @Override
+ public Object get(Request request, String name) {
+ return (request.internalDispatcherType == null) ?
DispatcherType.REQUEST
+ : request.internalDispatcherType;
+ }
+
+ @Override
+ public void set(Request request, String name, Object
value) {
+ request.internalDispatcherType = (DispatcherType)
value;
+ }
+ });
+ specialAttributes.put(Globals.DISPATCHER_REQUEST_PATH_ATTR,
+ new SpecialAttributeAdapter() {
+ @Override
+ public Object get(Request request, String name) {
+ return (request.requestDispatcherPath == null) ?
request
+ .getRequestPathMB().toString()
+ : request.requestDispatcherPath.toString();
+ }
+
+ @Override
+ public void set(Request request, String name, Object
value) {
+ request.requestDispatcherPath = value;
+ }
+ });
+ specialAttributes.put(Globals.ASYNC_SUPPORTED_ATTR,
+ new SpecialAttributeAdapter() {
+ @Override
+ public Object get(Request request, String name) {
+ return request.asyncSupported;
+ }
+
+ @Override
+ public void set(Request request, String name, Object
value) {
+ Boolean oldValue = request.asyncSupported;
+ request.asyncSupported = (Boolean)value;
+ request.notifyAttributeAssigned(name, value, oldValue);
+ }
+ });
+ specialAttributes.put(Globals.GSS_CREDENTIAL_ATTR,
+ new SpecialAttributeAdapter() {
+ @Override
+ public Object get(Request request, String name) {
+ if (request.userPrincipal instanceof GenericPrincipal)
{
+ return ((GenericPrincipal) request.userPrincipal)
+ .getGssCredential();
+ }
+ return null;
+ }
+
+ @Override
+ public void set(Request request, String name, Object
value) {
+ // NO-OP
+ }
+ });
+ specialAttributes.put(Globals.PARAMETER_PARSE_FAILED_ATTR,
+ new SpecialAttributeAdapter() {
+ @Override
+ public Object get(Request request, String name) {
+ if (request.getCoyoteRequest().getParameters()
+ .isParseFailed()) {
+ return Boolean.TRUE;
+ }
+ return null;
+ }
+
+ @Override
+ public void set(Request request, String name, Object
value) {
+ // NO-OP
+ }
+ });
+ }
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1200224&r1=1200223&r2=1200224&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Nov 10 08:53:39 2011
@@ -200,6 +200,10 @@
New filter <code>FailedRequestFilter</code> that will reject a request
if there were errors during HTTP parameter parsing. (kkolinko)
</add>
+ <update>
+ Improve special attributes handling in Request object by using hash
+ table lookup instead of series of string comparisons. (kkolinko)
+ </update>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
