Minor Description
URISupport.createURIWithQuery() fails on composite URIs that have an inner query but not an outer query, e.g.:
outerscheme:(innerscheme:innerssp?innerquery=0)
The failure is due to the method not taking into account this possibility and assuming the query consists of everything after the last question mark. The attached patch adds a test case in org.apache.activemq.util.URISupportTest that demonstrates the problem, and also modifies URISupport.createURIWithQuery() with a suggested fix for the problem.