Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source 
(cherry picked from commit 3767092)
This commit is contained in:
Juergen Hoeller
2016-08-31 01:53:03 +02:00
parent 31c5644691
commit ab9fea6b8d
6 changed files with 51 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-websocket/src/main/java/org/springframework/web/socket/WebSocketExtension.java
View File

@@ -118,11 +118,11 @@ public class WebSocketExtension {
public String toString() {
StringBuilder str = new StringBuilder();
str.append(this.name);
for (String param : parameters.keySet()) {
for (Map.Entry<String, String> entry : this.parameters.entrySet()) {
str.append(';');
str.append(param);
str.append(entry.getKey());
str.append('=');
str.append(this.parameters.get(param));
str.append(entry.getValue());
}
return str.toString();
}
@@ -136,16 +136,17 @@ public class WebSocketExtension {
* @throws IllegalArgumentException if the string cannot be parsed
*/
public static List<WebSocketExtension> parseExtensions(String extensions) {
if (!StringUtils.hasText(extensions)) {
return Collections.emptyList();
}
else {
List<WebSocketExtension> result = new ArrayList<>();
for (String token : StringUtils.tokenizeToStringArray(extensions, ",")) {
if (StringUtils.hasText(extensions)) {
String[] tokens = StringUtils.tokenizeToStringArray(extensions, ",");
List<WebSocketExtension> result = new ArrayList<WebSocketExtension>(tokens.length);
for (String token : tokens) {
result.add(parseExtension(token));
}
return result;
}
else {
return Collections.emptyList();
}
}
private static WebSocketExtension parseExtension(String extension) {