Avoid deadlock issue in CAJ/JCA lib

JeffersonLab · Jan 14, 2019 · 7894103 · 7894103
1 parent 2931cba
commit 7894103
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/java/org/jlab/epics2web/epics/ChannelMonitor.java b/src/java/org/jlab/epics2web/epics/ChannelMonitor.java
@@ -121,7 +121,9 @@ public void close() throws IOException {
         //LOGGER.log(Level.FINEST, "close");
         if (channel != null) {
             try {
-                channel.destroy();
+                // channel.destroy(); // method is unsafe (can deadlock)
+                // so use context method instead                
+                context.destroyChannel(channel, true);
             } catch (CAException e) {
                 throw new IOException("Unable to close channel", e);
             }