summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Wilson <jessewilson@google.com>2010-09-10 11:18:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-10 11:18:28 -0700
commitc97bdec93bfc67932066154a41fc3fce415ba8cc (patch)
tree4e20916bb519c2841991149365010fd343495ea9
parent06cd9298ee175bc45d83c73a25fb26b7f15d4814 (diff)
parentedd8b732ef48130375d9f987c79fdda452ed1d9e (diff)
downloadexternal_apache-http-c97bdec93bfc67932066154a41fc3fce415ba8cc.zip
external_apache-http-c97bdec93bfc67932066154a41fc3fce415ba8cc.tar.gz
external_apache-http-c97bdec93bfc67932066154a41fc3fce415ba8cc.tar.bz2
am edd8b732: Merge "Properly deprecate HttpRequestHandlerRegistry#matchUriRequestPattern."
Merge commit 'edd8b732ef48130375d9f987c79fdda452ed1d9e' into dalvik-dev * commit 'edd8b732ef48130375d9f987c79fdda452ed1d9e': Properly deprecate HttpRequestHandlerRegistry#matchUriRequestPattern.
-rw-r--r--src/org/apache/http/protocol/HttpRequestHandlerRegistry.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/org/apache/http/protocol/HttpRequestHandlerRegistry.java b/src/org/apache/http/protocol/HttpRequestHandlerRegistry.java
index 668d748..79701e3 100644
--- a/src/org/apache/http/protocol/HttpRequestHandlerRegistry.java
+++ b/src/org/apache/http/protocol/HttpRequestHandlerRegistry.java
@@ -73,8 +73,9 @@ public class HttpRequestHandlerRegistry implements HttpRequestHandlerResolver {
}
/**
- * @deprecated
+ * @deprecated use {@link UriPatternMatcher} directly
*/
+ @Deprecated
protected boolean matchUriRequestPattern(final String pattern, final String requestUri) {
return matcher.matchUriRequestPattern(pattern, requestUri);
}