netty 4.1.5

This commit is contained in:
Vladimir Krivosheev
2016-09-06 15:27:54 +02:00
parent f5f2cc385f
commit a033f50dbe
5 changed files with 3 additions and 11 deletions
+2 -2
View File
@@ -4,11 +4,11 @@
<root url="file://$PROJECT_DIR$/lib/annotations/netty"/>
</ANNOTATIONS>
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/netty-all-4.1.4.Final.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/netty-all-4.1.5.Final.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/src/netty-all-4.1.4.Final-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/src/netty-all-4.1.5.Final-sources.jar!/" />
</SOURCES>
</library>
</component>
+1 -1
View File
@@ -51,7 +51,7 @@ miglayout-core-5.0.jar
miglayout-swing-5.0.jar
nanoxml-2.2.3.jar
nekohtml-1.9.14.jar
netty-all-4.1.4.Final.jar
netty-all-4.1.5.Final.jar
oromatcher.jar
picocontainer.jar
protobuf-2.5.0.jar
@@ -14,7 +14,6 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.Url;
import com.intellij.util.UrlImpl;
import com.intellij.util.net.NetUtils;
import io.netty.channel.EventLoopGroup;
import io.netty.channel.oio.OioEventLoopGroup;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -124,13 +123,6 @@ public class BuiltInServerManagerImpl extends BuiltInServerManager {
return server;
}
@NotNull
public EventLoopGroup getEventLoopGroup() {
waitForStart();
assert server != null;
return server.getEventLoopGroup();
}
@Override
public boolean isOnBuiltInWebServer(@Nullable Url url) {
return url != null && !StringUtil.isEmpty(url.getAuthority()) && isOnBuiltInWebServerByAuthority(url.getAuthority());