TaglibFactory doesn't locate tld files properly

I have a tld file in a jar file which is put inside WEB-INF/lib folder of my web application. It has the uri: "/test-tags". So when I do t=JspTaglibs["/test-tags"] in my ftl file, I get an error saying /test-tags cannot be found in location /test-tags.
It seems that TaglibFactory is trying to load the tld files before fetching locations from web.xml and libjar files. Because of this, getTldPath() method is called with empty locations map and it returns the actual URI in the path.

The possible solution can be to remove the do while loop in the get() method and put this

----------------------------------------------------------
getLocationsFromWebXml();
getLocationsFromLibJars();

if (taglib.load(uri, ctx, locations)) {
taglibs.put(uri, taglib);
return taglib;
}
----------------------------------------------------------

This ensures that all the locations are fetched before trying to load the tld based on the uri. I tested this code in my application and it works perfectly well.

Thanks
Satish