From eb66628be5cde2707977e80379ef14c03234232e Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Tue, 18 Mar 2014 16:30:25 +0100
Subject: [PATCH] =?UTF-8?q?WEB-7303=20=E2=80=94=20node-webkit=20debug=20wo?=
 =?UTF-8?q?rks?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform-impl/src/org/jetbrains/io/BuiltInServer.java  | 2 +-
 platform/platform-impl/src/org/jetbrains/io/NettyUtil.java | 7 +++----
 .../src/org/jetbrains/io/PortUnificationServerHandler.java | 2 +-
 .../com/intellij/ide/browsers/OpenUrlHyperlinkInfo.java    | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/platform/platform-impl/src/org/jetbrains/io/BuiltInServer.java b/platform/platform-impl/src/org/jetbrains/io/BuiltInServer.java
index 08e3aa8893ce..eb12888eba07 100644
--- a/platform/platform-impl/src/org/jetbrains/io/BuiltInServer.java
+++ b/platform/platform-impl/src/org/jetbrains/io/BuiltInServer.java
@@ -80,7 +80,7 @@ public class BuiltInServer implements Disposable {
         @Override
         protected void initChannel(Channel channel) throws Exception {
           channel.pipeline().addLast(channelRegistrar);
-          NettyUtil.initHttpHandlers(channel.pipeline());
+          NettyUtil.addHttpServerCodec(channel.pipeline());
           channel.pipeline().addLast(handler, ChannelExceptionHandler.getInstance());
         }
       });
diff --git a/platform/platform-impl/src/org/jetbrains/io/NettyUtil.java b/platform/platform-impl/src/org/jetbrains/io/NettyUtil.java
index ac6ec542cb3e..0039af3779f5 100644
--- a/platform/platform-impl/src/org/jetbrains/io/NettyUtil.java
+++ b/platform/platform-impl/src/org/jetbrains/io/NettyUtil.java
@@ -27,8 +27,7 @@ import io.netty.channel.socket.nio.NioServerSocketChannel;
 import io.netty.channel.socket.nio.NioSocketChannel;
 import io.netty.channel.socket.oio.OioSocketChannel;
 import io.netty.handler.codec.http.HttpObjectAggregator;
-import io.netty.handler.codec.http.HttpRequestDecoder;
-import io.netty.handler.codec.http.HttpResponseEncoder;
+import io.netty.handler.codec.http.HttpServerCodec;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.ide.PooledThreadExecutor;
 
@@ -130,7 +129,7 @@ public final class NettyUtil {
     return bootstrap;
   }
 
-  public static void initHttpHandlers(ChannelPipeline pipeline) {
-    pipeline.addLast(new HttpRequestDecoder(), new HttpObjectAggregator(1048576 * 10), new HttpResponseEncoder());
+  public static void addHttpServerCodec(ChannelPipeline pipeline) {
+    pipeline.addLast(new HttpServerCodec(), new HttpObjectAggregator(1048576 * 10));
   }
 }
\ No newline at end of file
diff --git a/platform/platform-impl/src/org/jetbrains/io/PortUnificationServerHandler.java b/platform/platform-impl/src/org/jetbrains/io/PortUnificationServerHandler.java
index 0e9fc6a5e561..bddce72242e6 100644
--- a/platform/platform-impl/src/org/jetbrains/io/PortUnificationServerHandler.java
+++ b/platform/platform-impl/src/org/jetbrains/io/PortUnificationServerHandler.java
@@ -104,7 +104,7 @@ class PortUnificationServerHandler extends Decoder {
                          new PortUnificationServerHandler(delegatingHttpRequestHandler, detectSsl, false));
       }
       else if (isHttp(magic1, magic2)) {
-        NettyUtil.initHttpHandlers(pipeline);
+        NettyUtil.addHttpServerCodec(pipeline);
         pipeline.addLast(delegatingHttpRequestHandler);
         if (BuiltInServer.LOG.isDebugEnabled()) {
           pipeline.addLast(new ChannelHandlerAdapter() {
diff --git a/xml/impl/src/com/intellij/ide/browsers/OpenUrlHyperlinkInfo.java b/xml/impl/src/com/intellij/ide/browsers/OpenUrlHyperlinkInfo.java
index 7ba40265ecf7..e6bd32729b13 100644
--- a/xml/impl/src/com/intellij/ide/browsers/OpenUrlHyperlinkInfo.java
+++ b/xml/impl/src/com/intellij/ide/browsers/OpenUrlHyperlinkInfo.java
@@ -40,7 +40,7 @@ public final class OpenUrlHyperlinkInfo implements HyperlinkWithPopupMenuInfo {
     this(url, Conditions.<WebBrowser>alwaysTrue(), null);
   }
 
-  public OpenUrlHyperlinkInfo(@NotNull String url, @NotNull WebBrowser browser) {
+  public OpenUrlHyperlinkInfo(@NotNull String url, @Nullable WebBrowser browser) {
     this(url, null, browser);
   }
 
@@ -58,7 +58,7 @@ public final class OpenUrlHyperlinkInfo implements HyperlinkWithPopupMenuInfo {
   public ActionGroup getPopupMenuGroup(@NotNull MouseEvent event) {
     DefaultActionGroup group = new DefaultActionGroup();
     for (final WebBrowser browser : WebBrowserManager.getInstance().getActiveBrowsers()) {
-      if (browserCondition == null ? browser.equals(this.browser) : browserCondition.value(browser)) {
+      if (browserCondition == null ? (this.browser == null || browser.equals(this.browser)) : browserCondition.value(browser)) {
         group.add(new AnAction("Open in " + browser.getName(), "Open URL in " + browser.getName(), browser.getIcon()) {
           @Override
           public void actionPerformed(AnActionEvent e) {