From c2feedb7a2cf8d3b96ad0501b72df642c82f3aa0 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 24 Aug 2016 21:04:01 +0200 Subject: [PATCH] Revised assertions in StompHeaderAccessor Issue: SPR-14625 (cherry picked from commit f3f691c) --- .../simp/stomp/StompHeaderAccessor.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java index 76971b265f6..8e38664934d 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java @@ -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"); * 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.SimpMessageType; 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.MimeTypeUtils; import org.springframework.util.StringUtils; @@ -185,7 +185,9 @@ public class StompHeaderAccessor extends SimpMessageHeaderAccessor { } 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) { setHeader(COMMAND_HEADER, StompCommand.SEND); } @@ -196,7 +198,9 @@ public class StompHeaderAccessor extends SimpMessageHeaderAccessor { } 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(); if ((command == null) || StompCommand.SEND.equals(command)) { setHeader(COMMAND_HEADER, StompCommand.MESSAGE); @@ -434,7 +438,10 @@ public class StompHeaderAccessor extends SimpMessageHeaderAccessor { } 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; String contentType = (getContentType() != null ? " " + getContentType().toString() : ""); if (bytes.length == 0 || getContentType() == null || !isReadableContentType()) {