master
Juergen Hoeller 10 years ago
parent decc5cd1ae
commit e6d7af4ea8
  1. 4
      spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
  2. 17
      spring-websocket/src/main/java/org/springframework/web/socket/messaging/AbstractSubProtocolEvent.java

@ -111,9 +111,11 @@ public class DefaultListableBeanFactoryTests {
private static final Log factoryLog = LogFactory.getLog(DefaultListableBeanFactory.class);
@Rule
public ExpectedException thrown = ExpectedException.none();
@Test
public void testUnreferencedSingletonWasInstantiated() {
KnowsIfInstantiated.clearInstantiationRecord();
@ -1199,7 +1201,7 @@ public class DefaultListableBeanFactoryTests {
RootBeanDefinition rbd = new RootBeanDefinition(PropertiesFactoryBean.class);
MutablePropertyValues pvs = new MutablePropertyValues();
pvs.add("locations", new String[]{"#{foo}"});
pvs.add("locations", new String[] {"#{foo}"});
rbd.setPropertyValues(pvs);
bf.registerBeanDefinition("myProperties", rbd);
Properties properties = (Properties) bf.getBean("myProperties");

@ -16,17 +16,16 @@
package org.springframework.web.socket.messaging;
import org.springframework.context.ApplicationEvent;
import org.springframework.messaging.Message;
import org.springframework.util.Assert;
/**
* A base class for events for a message received from a WebSocket client and
* parsed into a higher level sub-protocol (e.g. STOMP).
* parsed into a higher-level sub-protocol (e.g. STOMP).
*
* @author Rossen Stoyanchev
* @since 4.0.3
* @since 4.1
*/
@SuppressWarnings("serial")
public abstract class AbstractSubProtocolEvent extends ApplicationEvent {
@ -35,37 +34,35 @@ public abstract class AbstractSubProtocolEvent extends ApplicationEvent {
/**
* Create a new SessionConnectEvent.
*
* Create a new AbstractSubProtocolEvent.
* @param source the component that published the event (never {@code null})
* @param message the connect message
* @param message the incoming message
*/
protected AbstractSubProtocolEvent(Object source, Message<byte[]> message) {
super(source);
Assert.notNull(message, "'message' must not be null");
Assert.notNull(message, "Message must not be null");
this.message = message;
}
/**
* Return the Message associated with the event. Here is an example of
* obtaining information about the session id or any headers in the
* message:
*
* <pre class="code">
* StompHeaderAccessor headers = StompHeaderAccessor.wrap(message);
* headers.getSessionId();
* headers.getSessionAttributes();
* headers.getPrincipal();
* </pre>
*
*/
public Message<byte[]> getMessage() {
return this.message;
}
@Override
public String toString() {
return getClass().getSimpleName() + "[" + this.message + "]";
}
}

Loading…
Cancel
Save