From 10f4f64e6f5c7afc7ee56635e9867f29bd669c5e Mon Sep 17 00:00:00 2001 From: Stephane Maldini Date: Tue, 26 Jan 2016 23:15:55 +0000 Subject: [PATCH] sync updates with mono --- .../http/server/reactive/boot/ReactorHttpServer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/ReactorHttpServer.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/ReactorHttpServer.java index 2538a4588d..91a1098f5b 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/ReactorHttpServer.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/ReactorHttpServer.java @@ -1,11 +1,11 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * 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 * distributed under the License is distributed on an "AS IS" BASIS, @@ -16,8 +16,8 @@ package org.springframework.http.server.reactive.boot; -import reactor.core.trait.Completable; -import reactor.core.trait.Connectable; +import reactor.core.graph.Connectable; +import reactor.core.state.Completable; import reactor.io.buffer.Buffer; import reactor.io.net.ReactiveNet;