2015-02-10 19:32 GMT+03:00 <jboy...@apache.org>: > Author: jboynes > Date: Tue Feb 10 16:32:13 2015 > New Revision: 1658754 > > URL: http://svn.apache.org/r1658754 > Log: > Check protocol when resolving on older JREs > > Added: > > tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/util/XmlUtilTest.java > (with props) > Modified: > tomcat/taglibs/standard/trunk/CHANGES.txt > > tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/UrlUtil.java > > tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java
> Modified: > tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/UrlUtil.java > URL: > http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/UrlUtil.java?rev=1658754&r1=1658753&r2=1658754&view=diff > ============================================================================== > --- > tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/UrlUtil.java > (original) > +++ > tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/UrlUtil.java > Tue Feb 10 16:32:13 2015 > @@ -77,4 +77,19 @@ public class UrlUtil { > // if so, we've got an absolute url > return true; > } > + > + public static String getScheme(CharSequence url) { This method is only used with a String argument. For a String it would be easier to use indexOf(':'), though it does special processing for "jar" protocol. > + StringBuilder scheme = new StringBuilder(); > + for (int i = 0; i < url.length(); i++) { > + char ch = url.charAt(i); > + if (ch == ':') { > + String result = scheme.toString(); > + if (!"jar".equals(result)) { > + return result; > + } > + } > + scheme.append(ch); > + } > + throw new IllegalArgumentException("No scheme found: " + url); > + } > } Best regards, Konstantin Kolinko --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
