Skip to content

removed no longer needed flag blockInThread #190

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
merged 2 commits into from
May 18, 2018
Merged

removed no longer needed flag blockInThread #190

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
208af41
removed no longer supported boolean flag
chrjohn May 17, 2018
d75efe5
made method SingleThreadedEventHandlingStrategy.block() private since…
chrjohn May 17, 2018
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
10 changes: 3 additions & 7 deletions quickfixj-core/src/main/java/quickfix/SocketAcceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,19 +99,15 @@ public SocketAcceptor(SessionFactory sessionFactory, SessionSettings settings) t

@Override
public void start() throws ConfigError, RuntimeError {
initialize(true);
initialize();
}

private void initialize(boolean blockInThread) throws ConfigError {
private void initialize() throws ConfigError {
if (isStarted.equals(Boolean.FALSE)) {
eventHandlingStrategy.setExecutor(longLivedExecutor);
startAcceptingConnections();
isStarted = Boolean.TRUE;
if (blockInThread) {
eventHandlingStrategy.blockInThread();
} else {
eventHandlingStrategy.block();
}
eventHandlingStrategy.blockInThread();
} else {
log.warn("Ignored attempt to start already running SocketAcceptor.");
}
Expand Down
10 changes: 3 additions & 7 deletions quickfixj-core/src/main/java/quickfix/SocketInitiator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public SocketInitiator(SessionFactory sessionFactory, SessionSettings settings,

@Override
public void start() throws ConfigError, RuntimeError {
initialize(true);
initialize();
}

@Override
Expand All @@ -131,7 +131,7 @@ public void stop(boolean forceDisconnect) {
}
}

private void initialize(boolean blockInThread) throws ConfigError {
private void initialize() throws ConfigError {
if (isStarted.equals(Boolean.FALSE)) {
eventHandlingStrategy.setExecutor(longLivedExecutor);
createSessionInitiators();
Expand All @@ -140,11 +140,7 @@ private void initialize(boolean blockInThread) throws ConfigError {
}
startInitiators();
isStarted = Boolean.TRUE;
if (blockInThread) {
eventHandlingStrategy.blockInThread();
} else {
eventHandlingStrategy.block();
}
eventHandlingStrategy.blockInThread();
} else {
log.warn("Ignored attempt to start already running SocketInitiator.");
}
Expand Down
2 changes: 1 addition & 1 deletion quickfixj-core/src/main/java/quickfix/mina/SingleThreadedEventHandlingStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public SessionConnector getSessionConnector() {
return sessionConnector;
}

public void block() {
private void block() {
while (true) {
synchronized (this) {
if (isStopped) {
Expand Down