Clean up StringBuilder use

Author: jhy

src/main/java/org/jsoup/helper/UrlBuilder.java

@@ -45,7 +45,9 @@ URL build() {
             appendToAscii(u.getPath(), false, normUrl);
             if (q != null) {
                 normUrl.append('?');
-                appendToAscii(StringUtil.releaseBuilder(q), true, normUrl);
+                String query = StringUtil.releaseBuilder(q);
+                q = null; // don't retain the released builder
+                appendToAscii(query, true, normUrl);
             }
             if (u.getRef() != null) {
                 normUrl.append('#');

src/main/java/org/jsoup/parser/TokenData.java

@@ -74,8 +74,7 @@ void reset() {
     String value() {
         if (builder != null) {
             // in rare case we get hit twice, don't toString the builder twice
-            value = builder.toString();
-            StringUtil.releaseBuilder(builder);
+            value = StringUtil.releaseBuilder(builder);
             builder = null;
             return value;
         }

src/test/java/org/jsoup/helper/HttpConnectionTest.java

@@ -308,8 +308,10 @@ public void caseInsensitiveHeaders(Locale locale) {
 
     @Test public void encodeUrl() throws MalformedURLException {
         URL url1 = new URL("https://test.com/foo%20bar/%5BOne%5D?q=white+space#frag");
-        URL url2 = new UrlBuilder(url1).build();
+        UrlBuilder builder = new UrlBuilder(url1);
+        URL url2 = builder.build();
         assertEquals("https://test.com/foo%20bar/%5BOne%5D?q=white+space#frag", url2.toExternalForm());
+        assertNull(builder.q);
     }
 
     @Test public void encodeUrlSupplementary() throws MalformedURLException {

src/test/java/org/jsoup/parser/TokeniserTest.java

@@ -213,4 +213,18 @@ public void bufferUpInAttributeVal() {
         data.append("def");
         assertEquals("abcdef", data.toString());
     }
+
+    @Test void tokenDataValueLifecycle() {
+        TokenData data = new TokenData();
+        data.set("abc");
+        data.append("def");
+        assertEquals("abcdef", data.value());
+        assertEquals("abcdef", data.value());
+
+        data.append('g');
+        assertEquals("abcdefg", data.value());
+
+        data.reset();
+        assertEquals("", data.value());
+    }
 }