Changeset 945 for trunk/zoo-project/zoo-kernel/service_internal.c

Timestamp:

Aug 14, 2019, 4:30:34 PM (5 years ago)

Author:

djay

Message:

Fix the issue with JavaScript? support and GDAL profile service

File:

• trunk/zoo-project/zoo-kernel/service_internal.c (modified) (1 diff)

trunk/zoo-project/zoo-kernel/service_internal.c

@@ -198 +198 @@
   int res=-1;
   if(s!=NULL){
+    int fcntlRes;
     s->lock.l_type = F_UNLCK;
     res=fcntl(fileno(s->lockfile), F_SETLK, &s->lock);
     if(res==-1)
       return res;
-    fclose(s->lockfile);
 #ifndef WIN32
     // Check if there is any process locking a file and delete the lock if not.
     s->lock.l_type = F_WRLCK;
-    if(fcntl(fileno(s->lockfile), F_GETLK, &s->lock)!=-1 && s->lock.l_type == F_UNLCK){
-#endif
+    fcntlRes=fcntl(fileno(s->lockfile), F_GETLK, &s->lock);
+    if(fcntlRes!=1 && s->lock.l_type == F_UNLCK){
+#endif
+      fclose(s->lockfile);
       zUnlink(s->filename);
 #ifndef WIN32