commit c97bdec93bfc67932066154a41fc3fce415ba8cc
author Jesse Wilson <jessewilson@google.com> Fri Sep 10 11:18:28 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 10 11:18:28 2010 -0700
tree 4e20916bb519c2841991149365010fd343495ea9
parent 06cd9298ee175bc45d83c73a25fb26b7f15d4814
parent edd8b732ef48130375d9f987c79fdda452ed1d9e

am edd8b732: Merge "Properly deprecate HttpRequestHandlerRegistry#matchUriRequestPattern."

Merge commit 'edd8b732ef48130375d9f987c79fdda452ed1d9e' into dalvik-dev

* commit 'edd8b732ef48130375d9f987c79fdda452ed1d9e':
  Properly deprecate HttpRequestHandlerRegistry#matchUriRequestPattern.

src/org/apache/http/protocol/HttpRequestHandlerRegistry.java

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 @@
     }
 
     /**
-     * @deprecated
+     * @deprecated use {@link UriPatternMatcher} directly
      */
+    @Deprecated
     protected boolean matchUriRequestPattern(final String pattern, final String requestUri) {
         return matcher.matchUriRequestPattern(pattern, requestUri);
     }