BackwardCompatibleURLPatternDeploymentAspect is mangling valid URLpatterns

BackwardCompatibleURLPatternDeploymentAspect overrides method getExplicitPattern to check for and remove any leading context root in a servlet mapping URL pattern e.g. if the context root is "/provider" and the URL pattern is "/provider/services/* it 'corrects' the URL pattern to "/services/". However, it is over-eager. For example, if the context root is "/provider" and the URL pattern is "/providerservices/" then the pattern is mangled to "services/*" causing problems down the line. The check at line 59 needs to be modified a follows

StringTokenizer st = new StringTokenizer(urlPattern, "/");

• if (st.countTokens() > 1 && urlPattern.startsWith(contextRoot))
  + if (st.countTokens() > 1 && urlPattern.startsWith(contextRoot + "/")) { urlPattern = urlPattern.substring(contextRoot.length()); }