Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adjust readonly field generation logic #26

Merged
merged 2 commits into from
Jun 18, 2024
Merged

Adjust readonly field generation logic #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e748b41
Change date type of readonly from primitive boolean to Boolean class
Jun 18, 2024
26d2a24
Ensure both last_readonly and readonly are the OR logic of isReadonly…
Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/pvws/ws/Vtype2Json.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public class Vtype2Json
* @return JSON text
* @throws Exception on error
*/
public static String toJson(final String name, final VType value, final VType last_value, final boolean last_readonly, final boolean readonly) throws Exception
public static String toJson(final String name, final VType value, final VType last_value, final Boolean last_readonly, final Boolean readonly) throws Exception
{
final ByteArrayOutputStream buf = new ByteArrayOutputStream();
final JsonGenerator g = json_factory.createGenerator(buf);
Expand Down Expand Up @@ -94,7 +94,7 @@ else if (value != null)
// null: Neither 'value' nor 'text'

// Change in read/write access?
if (last_readonly != readonly)
if (last_readonly == null || !last_readonly.equals(readonly))
g.writeBooleanField("readonly", readonly);

final Time time = Time.timeOf(value);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/pvws/ws/WebSocket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ public void onError(final Throwable ex)
* @param last_readonly Was the PV read-only?
* @param readonly Is the PV read-only?
*/
public void sendUpdate(final String name, final VType value, final VType last_value, final boolean last_readonly, final boolean readonly)
public void sendUpdate(final String name, final VType value, final VType last_value, final Boolean last_readonly, final Boolean readonly)
{
try
{
Expand Down
12 changes: 7 additions & 5 deletions src/main/java/pvws/ws/WebSocketPV.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class WebSocketPV
subscription_access = new AtomicReference<>();
private volatile boolean subscribed_for_array = false;
private volatile VType last_value = null;
private volatile boolean last_readonly = true;
private volatile Boolean last_readonly = null;

static
{
Expand Down Expand Up @@ -134,18 +134,20 @@ private void handleUpdates(final VType value)
}
}

socket.sendUpdate(name, value, last_value, last_readonly, pv.isReadonly() || !PV_WRITE_SUPPORT);
Boolean current_readonly = pv.isReadonly() || !PV_WRITE_SUPPORT;
socket.sendUpdate(name, value, last_value, last_readonly, current_readonly);
last_value = value;
last_readonly = pv.isReadonly();
last_readonly = current_readonly;
}

/** Handle change in access permissions
* @param readonly Latest access mode
*/
private void handleAccessChanges(final Boolean readonly)
{
socket.sendUpdate(name, last_value, last_value, last_readonly, pv.isReadonly() || !PV_WRITE_SUPPORT);
last_readonly = pv.isReadonly();
Boolean current_readonly = pv.isReadonly() || !PV_WRITE_SUPPORT;
socket.sendUpdate(name, last_value, last_value, last_readonly, current_readonly);
last_readonly = current_readonly;
}

/** @return Most recent value or null */
Expand Down
Loading