Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing bad merge of Resource.java 

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2019-04-03 18:08:36 -05:00
parent 81356d9d18
commit 954a8bd6a3
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
View File

@ -45,8 +45,6 @@ import org.eclipse.jetty.util.UrlEncoded;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; 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) if (query != null)
{ {
MultiMap<String> params = new MultiMap<>(); MultiMap<String> params = new MultiMap<>();
byte[] rawQuery = query.getBytes(UTF_8); UrlEncoded.decodeUtf8To(query, 0, query.length(), params);
UrlEncoded.decodeUtf8To(rawQuery, 0, query.length(), params);
String paramO = params.getString("O"); String paramO = params.getString("O");
String paramC = params.getString("C"); String paramC = params.getString("C");
@ -746,7 +743,7 @@ public abstract class Resource implements ResourceFactory, Closeable
// Name // Name
buf.append("<tr><td class=\"name\"><a href=\""); 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(path);
buf.append("\">"); buf.append("\">");
buf.append(deTag(name)); buf.append(deTag(name));