Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

improve the code of URLStrParser.java #8085

Merged
merged 1 commit into from Jun 21, 2021
Merged

improve the code of URLStrParser.java #8085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion dubbo-common/src/main/java/org/apache/dubbo/common/URL.java
View file
Open in desktop
Expand Up @@ -248,7 +248,7 @@ public static URL valueOf(String url) {
Map<String, String> parameters = null;
int i = url.indexOf('?'); // separator between body and parameters
if (i >= 0) {
String[] parts = url.substring(i + 1).split("&");
String[] parts = url.substring(i + 1).split("[&;]");
parameters = new HashMap<>();
for (String part : parts) {
part = part.trim();
Expand Down
36 changes: 12 additions & 24 deletions dubbo-common/src/main/java/org/apache/dubbo/common/URLStrParser.java
View file
Open in desktop
Expand Up @@ -224,32 +224,20 @@ private static boolean addParam(String str, boolean isEncoded, int nameStart, in
valueStart = valueEnd + 1;
}

String name;
String value;
if (isEncoded) {
String name = decodeComponent(str, nameStart, valueStart - 3, false, tempBuf);
String value = decodeComponent(str, valueStart, valueEnd, false, tempBuf);
if (valueStart == valueEnd) {
value = name;
} else {
value = decodeComponent(str, valueStart, valueEnd, false, tempBuf);
}
params.put(name, value);
// compatible with lower versions registering "default." keys
if (name.startsWith(DEFAULT_KEY_PREFIX)) {
params.putIfAbsent(name.substring(DEFAULT_KEY_PREFIX.length()), value);
}
name = decodeComponent(str, nameStart, valueStart - 3, false, tempBuf);
value = valueStart == valueEnd ? name : decodeComponent(str, valueStart, valueEnd, false, tempBuf);
} else {
String name = str.substring(nameStart, valueStart - 1);
String value = str.substring(valueStart, valueEnd);
if (valueStart == valueEnd) {
value = name;
} else {
value = str.substring(valueStart, valueEnd);
}
params.put(name, value);
// compatible with lower versions registering "default." keys
if (name.startsWith(DEFAULT_KEY_PREFIX)) {
params.putIfAbsent(name.substring(DEFAULT_KEY_PREFIX.length()), value);
}
name = str.substring(nameStart, valueStart - 1);
value = valueStart == valueEnd ? name : str.substring(valueStart, valueEnd);
}

params.put(name, value);
// compatible with lower versions registering "default." keys
if (name.startsWith(DEFAULT_KEY_PREFIX)) {
params.putIfAbsent(name.substring(DEFAULT_KEY_PREFIX.length()), value);
}
return true;
}
Expand Down