From 954a8bd6a38c6e0b6171f33a0c2f9c39b01938ec Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 3 Apr 2019 18:08:36 -0500
Subject: [PATCH] Fixing bad merge of Resource.java

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 .../java/org/eclipse/jetty/util/resource/Resource.java     | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
index 174ad0d2d23..2ff09c8d54a 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
@@ -45,8 +45,6 @@ import org.eclipse.jetty.util.UrlEncoded;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
-
 
 /* ------------------------------------------------------------ */
 /** 
@@ -574,8 +572,7 @@ public abstract class Resource implements ResourceFactory, Closeable
         if (query != null)
         {
             MultiMap<String> params = new MultiMap<>();
-            byte[] rawQuery = query.getBytes(UTF_8);
-            UrlEncoded.decodeUtf8To(rawQuery, 0, query.length(), params);
+            UrlEncoded.decodeUtf8To(query, 0, query.length(), params);
 
             String paramO = params.getString("O");
             String paramC = params.getString("C");
@@ -746,7 +743,7 @@ public abstract class Resource implements ResourceFactory, Closeable
 
             // Name
             buf.append("<tr><td class=\"name\"><a href=\"");
-            String path=URIUtil.addPaths(encodedBase,URIUtil.encodePath(name));
+            String path=URIUtil.addEncodedPaths(encodedBase,URIUtil.encodePath(name));
             buf.append(path);
             buf.append("\">");
             buf.append(deTag(name));