From 518254d0065249829b0dace101933751b8515978 Mon Sep 17 00:00:00 2001
From: zhouping <zhouping@finereport.com>
Date: Wed, 10 Aug 2016 14:24:56 +0800
Subject: [PATCH] =?UTF-8?q?bug88297:=E4=BD=BF=E7=94=A8=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8F=92=E4=BB=B6=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=EF=BC=8C=E6=9C=89=E7=9A=84jar=E5=8C=85=E6=A6=82=E7=8E=87?=
 =?UTF-8?q?=E6=80=A7=E5=88=A0=E9=99=A4=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/RestartHelper.java      | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/designer_base/src/com/fr/design/RestartHelper.java b/designer_base/src/com/fr/design/RestartHelper.java
index 4dff98615..53aa5e56b 100644
--- a/designer_base/src/com/fr/design/RestartHelper.java
+++ b/designer_base/src/com/fr/design/RestartHelper.java
@@ -4,15 +4,11 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogger;
 import com.fr.general.GeneralUtils;
-import com.fr.stable.ArrayUtils;
-import com.fr.stable.OperatingSystem;
-import com.fr.stable.StableUtils;
-import com.fr.stable.StringUtils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import com.fr.stable.*;
+
+import java.io.*;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -153,6 +149,18 @@ public class RestartHelper {
         }
 
         try {
+            try {
+                File restartLockFile = new File(StableUtils.pathJoin(StableUtils.getInstallHome(), "restart.lock"));
+                StableUtils.makesureFileExist(restartLockFile);
+                RandomAccessFile randomAccessFile = new RandomAccessFile(restartLockFile,"rw");
+                FileChannel restartLockFC = randomAccessFile.getChannel();
+                FileLock restartLock = restartLockFC.tryLock();
+                if(restartLock == null) {
+                    FRLogger.getLogger().error("restart lock null!");
+                }
+            }catch (Exception e){
+                FRLogger.getLogger().error(e.getMessage());
+            }
             if (OperatingSystem.isMacOS()) {
                 restartInMacOS(installHome, filesToBeDelete);
             } else {