MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'IDEA-CR-10038'

Browse Source 
# Conflicts:
#	platform/built-in-server/src/org/jetbrains/ide/OpenFileHttpService.java
#	platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java
#	platform/util/resources/misc/registry.properties
This commit is contained in:
Vladimir Krivosheev
2016-05-17 11:12:11 +02:00
parent b0b8eab333 27c5e39ee4
commit 0e6cd68aee
71 changed files with 1281 additions and 802 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/runners/ProcessProxyImpl.java
+3 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,13 +17,13 @@ package com.intellij.execution.runners;
import com.intellij.execution.process.ProcessHandler;
import com.intellij.openapi.util.Key;
import com.intellij.util.net.NetUtils;
import org.jetbrains.annotations.NonNls;
import java.io.BufferedWriter;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
@@ -95,7 +95,7 @@ class ProcessProxyImpl implements ProcessProxy {
if (myWriter == null) {
try {
if (mySocket == null) {
mySocket = new Socket(NetUtils.getLoopbackAddress(), myPortNumber);
mySocket = new Socket(InetAddress.getLoopbackAddress(), myPortNumber);
}
myWriter = new PrintWriter(new BufferedWriter(new OutputStreamWriter(mySocket.getOutputStream())));
}