|
10 | 10 | import java.util.logging.Level; |
11 | 11 | import java.util.regex.Pattern; |
12 | 12 |
|
| 13 | +import org.epics.gpclient.ReadCollector; |
13 | 14 | import org.epics.gpclient.datasource.MultiplexedChannelHandler; |
| 15 | +import org.epics.gpclient.datasource.ca.types.CATypeAdapter; |
14 | 16 |
|
15 | 17 | import gov.aps.jca.CAException; |
16 | 18 | import gov.aps.jca.Channel; |
@@ -67,11 +69,9 @@ protected void connect() { |
67 | 69 | // Give the listener right away so that no event gets lost |
68 | 70 | // If it's a large array, connect using lower priority |
69 | 71 | if (largeArray) { |
70 | | - channel = caDataSource.getContext().createChannel(getChannelName(), connectionListener, |
71 | | - Channel.PRIORITY_MIN); |
| 72 | + channel = caDataSource.getContext().createChannel(getChannelName(), connectionListener, Channel.PRIORITY_MIN); |
72 | 73 | } else { |
73 | | - channel = caDataSource.getContext().createChannel(getChannelName(), connectionListener, |
74 | | - (short) (Channel.PRIORITY_MIN + 1)); |
| 74 | + channel = caDataSource.getContext().createChannel(getChannelName(), connectionListener, (short) (Channel.PRIORITY_MIN + 1)); |
75 | 75 | } |
76 | 76 | } catch (CAException ex) { |
77 | 77 | throw new RuntimeException("JCA Connection failed", ex); |
@@ -106,6 +106,11 @@ protected boolean isWriteConnected(CAConnectionPayload connPayload) { |
106 | 106 | return connPayload != null && connPayload.isWriteConnected(); |
107 | 107 | } |
108 | 108 |
|
| 109 | + @Override |
| 110 | + protected CATypeAdapter findTypeAdapter(ReadCollector<?, ?> cache, CAConnectionPayload connection) { |
| 111 | + return caDataSource.getCaTypeSupport().find(cache, connection); |
| 112 | + } |
| 113 | + |
109 | 114 | private final ConnectionListener connectionListener = new ConnectionListener() { |
110 | 115 |
|
111 | 116 | @Override |
|
0 commit comments