From b577a863e1ad81c25ee071a9403cec149663bd21 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 15 Jun 2016 16:00:27 +0300
Subject: [PATCH] Cleanup (formatting)

---
 .../src/com/intellij/idea/SocketLock.java         | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/idea/SocketLock.java b/platform/platform-impl/src/com/intellij/idea/SocketLock.java
index 31ff1ac520e5..8eac730b3f81 100644
--- a/platform/platform-impl/src/com/intellij/idea/SocketLock.java
+++ b/platform/platform-impl/src/com/intellij/idea/SocketLock.java
@@ -125,7 +125,7 @@ public final class SocketLock {
   }
 
   @NotNull
-  public ActivateStatus lock(@NotNull final String[] args) throws Exception {
+  public ActivateStatus lock(@NotNull String[] args) throws Exception {
     log("enter: lock(config=%s system=%s)", myConfigPath, mySystemPath);
 
     return underLocks(() -> {
@@ -139,6 +139,7 @@ public final class SocketLock {
         for (Map.Entry<Integer, Collection<String>> entry : portToPath.entrySet()) {
           ActivateStatus status = tryActivate(entry.getKey(), entry.getValue(), args);
           if (status != ActivateStatus.NO_INSTANCE) {
+            log("exit: lock(): " + status);
             return status;
           }
         }
@@ -177,19 +178,11 @@ public final class SocketLock {
 
   private <V> V underLocks(@NotNull Callable<V> action) throws Exception {
     FileUtilRt.createDirectory(new File(myConfigPath));
-    FileOutputStream lock1 = new FileOutputStream(new File(myConfigPath, PORT_LOCK_FILE), true);
-    try {
+    try (@SuppressWarnings("unused") FileOutputStream lock1 = new FileOutputStream(new File(myConfigPath, PORT_LOCK_FILE), true)) {
       FileUtilRt.createDirectory(new File(mySystemPath));
-      FileOutputStream lock2 = new FileOutputStream(new File(mySystemPath, PORT_LOCK_FILE), true);
-      try {
+      try (@SuppressWarnings("unused") FileOutputStream lock2 = new FileOutputStream(new File(mySystemPath, PORT_LOCK_FILE), true)) {
         return action.call();
       }
-      finally {
-        lock2.close();
-      }
-    }
-    finally {
-      lock1.close();
     }
   }