BUG: fileMonitor: do not allow used watch also in free watches.

See #1328.

src/OSspecific/MSwindows/fileMonitor/fileMonitor.C

@@ -450,14 +450,16 @@ Foam::fileMonitor::~fileMonitor()
 // regIOobject)
 Foam::label Foam::fileMonitor::addWatch(const fileName& fName)
 {
-    label watchFd;
+    if (debug)
+    {
+        Pout<< "fileMonitor : adding watch on file " << fName << endl;
+    }
 
-    label sz = freeWatchFds_.size();
+    label watchFd;
 
-    if (sz)
+    if (freeWatchFds_.size())
     {
-        watchFd = freeWatchFds_[sz-1];
-        freeWatchFds_.setSize(sz-1);
+        watchFd = freeWatchFds_.remove();
     }
     else
     {
@@ -495,7 +497,10 @@ bool Foam::fileMonitor::removeWatch(const label watchFd)
             << watchFile_[watchFd] << endl;
     }
 
-    freeWatchFds_.append(watchFd);
+    if (!freeWatchFds_.found(watchFd))
+    {
+        freeWatchFds_.append(watchFd);
+    }
     return watcher_->removeWatch(watchFd);
 }
 

src/OSspecific/POSIX/fileMonitor/fileMonitor.C

@@ -446,14 +446,16 @@ Foam::fileMonitor::~fileMonitor()
 // regIOobject)
 Foam::label Foam::fileMonitor::addWatch(const fileName& fName)
 {
-    label watchFd;
+    if (debug)
+    {
+        Pout<< "fileMonitor : adding watch on file " << fName << endl;
+    }
 
-    label sz = freeWatchFds_.size();
+    label watchFd;
 
-    if (sz)
+    if (freeWatchFds_.size())
     {
-        watchFd = freeWatchFds_[sz-1];
-        freeWatchFds_.setSize(sz-1);
+        watchFd = freeWatchFds_.remove();
     }
     else
     {
@@ -491,7 +493,10 @@ bool Foam::fileMonitor::removeWatch(const label watchFd)
             << watchFile_[watchFd] << endl;
     }
 
-    freeWatchFds_.append(watchFd);
+    if (!freeWatchFds_.found(watchFd))
+    {
+        freeWatchFds_.append(watchFd);
+    }
     return watcher_->removeWatch(watchFd);
 }