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

Revised assertions in StompHeaderAccessor

Browse Source 
Issue: SPR-14625
(cherry picked from commit f3f691c)
This commit is contained in:
Juergen Hoeller
2016-08-24 21:04:01 +02:00
parent 0735e9ba98
commit c2feedb7a2
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2015 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ import org.springframework.messaging.Message;
import org.springframework.messaging.simp.SimpMessageHeaderAccessor; import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
import org.springframework.messaging.simp.SimpMessageType; import org.springframework.messaging.simp.SimpMessageType;
import org.springframework.messaging.support.MessageHeaderAccessor; import org.springframework.messaging.support.MessageHeaderAccessor;
import org.springframework.util.Assert; import org.springframework.util.ClassUtils;
import org.springframework.util.MimeType; import org.springframework.util.MimeType;
import org.springframework.util.MimeTypeUtils; import org.springframework.util.MimeTypeUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@@ -185,7 +185,9 @@ public class StompHeaderAccessor extends SimpMessageHeaderAccessor {
} }
public StompCommand updateStompCommandAsClientMessage() { public StompCommand updateStompCommandAsClientMessage() {
Assert.state(SimpMessageType.MESSAGE.equals(getMessageType()), "Unexpected message type " + getMessage()); if (getMessageType() != SimpMessageType.MESSAGE) {
throw new IllegalStateException("Unexpected message type " + getMessageType());
}
if (getCommand() == null) { if (getCommand() == null) {
setHeader(COMMAND_HEADER, StompCommand.SEND); setHeader(COMMAND_HEADER, StompCommand.SEND);
} }
@@ -196,7 +198,9 @@ public class StompHeaderAccessor extends SimpMessageHeaderAccessor {
} }
public void updateStompCommandAsServerMessage() { public void updateStompCommandAsServerMessage() {
Assert.state(SimpMessageType.MESSAGE.equals(getMessageType()), "Unexpected message type " + getMessage()); if (getMessageType() != SimpMessageType.MESSAGE) {
throw new IllegalStateException("Unexpected message type " + getMessageType());
}
StompCommand command = getCommand(); StompCommand command = getCommand();
if ((command == null) || StompCommand.SEND.equals(command)) { if ((command == null) || StompCommand.SEND.equals(command)) {
setHeader(COMMAND_HEADER, StompCommand.MESSAGE); setHeader(COMMAND_HEADER, StompCommand.MESSAGE);
@@ -434,7 +438,10 @@ public class StompHeaderAccessor extends SimpMessageHeaderAccessor {
} }
private String appendPayload(Object payload) { private String appendPayload(Object payload) {
Assert.isInstanceOf(byte[].class, payload); if (payload.getClass() != byte[].class) {
throw new IllegalStateException(
"Expected byte array payload but got: " + ClassUtils.getQualifiedName(payload.getClass()));
}
byte[] bytes = (byte[]) payload; byte[] bytes = (byte[]) payload;
String contentType = (getContentType() != null ? " " + getContentType().toString() : ""); String contentType = (getContentType() != null ? " " + getContentType().toString() : "");
if (bytes.length == 0 || getContentType() == null || !isReadableContentType()) { if (bytes.length == 0 || getContentType() == null || !isReadableContentType()) {