diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java
index f9595cfc387..43c7dbe2ce6 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java
@@ -204,14 +204,14 @@ protected boolean checkRequestURI(HttpServletRequest request, List<String> uris,
         }
         String servletPath = request.getServletPath();
         String pathInfo = request.getPathInfo();
-        if (pathInfo == null) {
+        if (StringUtils.isEmpty(pathInfo)) {
             if (servletPath != null) {
                 servletPath += "";
             }
         } else {
             servletPath += pathInfo;
         }
-        if (servletPath == null) {
+        if (StringUtils.isEmpty(servletPath)) {
             servletPath = (String)m.get(Message.PATH_INFO);
         }
         boolean foundValidScope = false;