Skip to content

PutRequest update to handle NTTable #2942

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

Merged
georgweiss merged 1 commit into from
Feb 13, 2024
Merged

PutRequest update to handle NTTable #2942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 5 additions & 14 deletions core/pva/src/main/java/org/epics/pva/client/PutRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,22 +158,13 @@ public void encodeRequest(final byte version, final ByteBuffer buffer) throws Ex
}
}
}
// Set bit for the field to write
changed.set(data.getIndex(field));

// Bitset to describe which field we're about to write
//final BitSet changed = new BitSet();
changed.set(data.getIndex(field));
if (field instanceof PVAStructure) {
final PVAStructure struct = (PVAStructure) field;
List<PVAData> elements = struct.get();
if(elements != null){
for(int i = 0; i < elements.size(); i++){
changed.set(data.getIndex(elements.get(i)));
}
}
else{
// Set bit for the field to write
changed.set(data.getIndex(field));
}

logger.log(Level.FINE, () -> "Updated structure elements: " + changed);

PVABitSet.encodeBitSet(changed, buffer);

// Write the updated field
Expand Down
3 changes: 1 addition & 2 deletions core/pva/src/main/java/org/epics/pva/data/PVABitSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ public static void encodeBitSet(final BitSet bits, final ByteBuffer buffer)
{
final byte[] bytes = bits.toByteArray();
PVASize.encodeSize(bytes.length, buffer);
byte[] b = bits.toByteArray();
buffer.put(b);
buffer.put(bytes);
}

/** @param buffer Source buffer
Expand Down