Index: src/AsynDriverInterface.cc
===================================================================
RCS file: /afs/psi.ch/user/z/zimoch/.cvsroot/StreamDevice2/src/AsynDriverInterface.cc,v
retrieving revision 1.15
diff -u -r1.15 AsynDriverInterface.cc
--- src/AsynDriverInterface.cc	10 Oct 2007 16:00:55 -0000	1.15
+++ src/AsynDriverInterface.cc	7 Nov 2007 16:04:09 -0000
@@ -462,11 +462,6 @@
         clientName(), lockTimeout_ms);
     asynStatus status;
     lockTimeout = lockTimeout_ms ? lockTimeout_ms*0.001 : -1.0;
-    if (!lockTimeout_ms)
-    {
-        if (!connectToAsynPort()) return false;
-    }
-    
     ioAction = Lock;
     status = pasynManager->queueRequest(pasynUser, priority(),
         lockTimeout);
@@ -519,10 +514,12 @@
 void AsynDriverInterface::
 lockHandler()
 {
+    int connected;
     debug("AsynDriverInterface::lockHandler(%s)\n",
         clientName());
     pasynManager->blockProcessCallback(pasynUser, false);
-    lockCallback(StreamIoSuccess);
+    connected = connectToAsynPort();
+    lockCallback(connected ? StreamIoSuccess : StreamIoFault);
 }
 
 // interface function: we don't need exclusive access any more