Skip to content

Fixes #235 : concurrency bug in FSTStreamDecoder/FSTStreamEncoder #254

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

Open
andrewl102 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes #235 : concurrency bug in FSTStreamDecoder/FSTStreamEncoder #254

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
14 changes: 2 additions & 12 deletions src/main/java/org/nustaq/serialization/coders/FSTStreamDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,13 @@ public class FSTStreamDecoder implements FSTDecoder {

public FSTStreamDecoder(FSTConfiguration conf) {
this.conf = conf;
clnames = (FSTClazzNameRegistry) conf.getCachedObject(FSTClazzNameRegistry.class);
if (clnames == null) {
clnames = new FSTClazzNameRegistry(conf.getClassRegistry());
} else {
clnames.clear();
}
clnames = new FSTClazzNameRegistry(conf.getClassRegistry());
}

@Override
public void setConf(FSTConfiguration conf) {
this.conf = conf;
clnames = (FSTClazzNameRegistry) conf.getCachedObject(FSTClazzNameRegistry.class);
if (clnames == null) {
clnames = new FSTClazzNameRegistry(conf.getClassRegistry());
} else {
clnames.clear();
}
clnames = new FSTClazzNameRegistry(conf.getClassRegistry());
}

public int ensureReadAhead(int bytes) {
Expand Down
14 changes: 2 additions & 12 deletions src/main/java/org/nustaq/serialization/coders/FSTStreamEncoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,23 +35,13 @@ public class FSTStreamEncoder implements FSTEncoder {

public FSTStreamEncoder(FSTConfiguration conf) {
this.conf = conf;
clnames = (FSTClazzNameRegistry) conf.getCachedObject(FSTClazzNameRegistry.class);
if ( clnames == null ) {
clnames = new FSTClazzNameRegistry(conf.getClassRegistry());
} else {
clnames.clear();
}
clnames = new FSTClazzNameRegistry(conf.getClassRegistry());
}

@Override
public void setConf(FSTConfiguration conf) {
this.conf = conf;
clnames = (FSTClazzNameRegistry) conf.getCachedObject(FSTClazzNameRegistry.class);
if ( clnames == null ) {
clnames = new FSTClazzNameRegistry(conf.getClassRegistry());
} else {
clnames.clear();
}
clnames = new FSTClazzNameRegistry(conf.getClassRegistry());
}

void writeFBooleanArr(boolean[] arr, int off, int len) throws IOException {
Expand Down