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

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2016-07-15 22:47:12 +02:00
parent 69dd40ec89
commit afe106e254
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/UndertowXhrTransport.java
View File

@@ -1,11 +1,11 @@
/* /*
* 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.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
@@ -326,14 +326,12 @@ public class UndertowXhrTransport extends AbstractXhrTransport {
result.getResponse().putAttachment(RESPONSE_BODY, string); result.getResponse().putAttachment(RESPONSE_BODY, string);
latch.countDown(); latch.countDown();
} }
@Override @Override
protected void error(IOException ex) { protected void error(IOException ex) {
onFailure(latch, ex); onFailure(latch, ex);
} }
}.setup(result.getResponseChannel()); }.setup(result.getResponseChannel());
} }
@Override @Override
public void failed(IOException ex) { public void failed(IOException ex) {
onFailure(latch, ex); onFailure(latch, ex);
@@ -473,7 +471,7 @@ public class UndertowXhrTransport extends AbstractXhrTransport {
public void onFailure(Throwable failure) { public void onFailure(Throwable failure) {
IoUtils.safeClose(this.connection); IoUtils.safeClose(this.connection);
if (connectFuture.setException(failure)) { if (this.connectFuture.setException(failure)) {
return; return;
} }
if (this.session.isDisconnected()) { if (this.session.isDisconnected()) {

4
spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationTests.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.
@@ -61,7 +61,7 @@ public class WebSocketConfigurationTests extends AbstractWebSocketIntegrationTes
@Override @Override
protected Class<?>[] getAnnotatedConfigClasses() { protected Class<?>[] getAnnotatedConfigClasses() {
return new Class<?>[] { TestConfig.class }; return new Class<?>[] {TestConfig.class};
} }
@Test @Test