Skip to content

JENA-2356: Fix race in QueryEngineRegistry, UpdateEngineRegistry init #2047

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
afs merged 1 commit into from
Oct 21, 2023
Merged

JENA-2356: Fix race in QueryEngineRegistry, UpdateEngineRegistry init #2047

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
9 changes: 4 additions & 5 deletions jena-arq/src/main/java/org/apache/jena/sparql/engine/QueryEngineRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,13 @@
public class QueryEngineRegistry
{
List<QueryEngineFactory> factories = new ArrayList<>();
static { init(); }

// Singleton
static QueryEngineRegistry registry = null;
private static QueryEngineRegistry registry;
static { init(); }

static public QueryEngineRegistry get()
{
if ( registry == null )
init();
return registry;
}

Expand Down Expand Up @@ -86,7 +85,7 @@ public static QueryEngineRegistry copyFrom(Context context) {

public QueryEngineRegistry() { }

private static synchronized void init()
private static void init()
{
registry = new QueryEngineRegistry();
registry.add(QueryEngineMain.getFactory());
Expand Down
9 changes: 4 additions & 5 deletions jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,19 @@
public class UpdateEngineRegistry
{
List<UpdateEngineFactory> factories = new ArrayList<>() ;
static { init() ; }

// Singleton
static UpdateEngineRegistry registry = null ;
private static UpdateEngineRegistry registry ;
static { init() ; }

static public UpdateEngineRegistry get()
{
if ( registry == null )
init() ;
return registry;
}

private UpdateEngineRegistry() { }

private static synchronized void init()
private static void init()
{
registry = new UpdateEngineRegistry() ;
registry.add(UpdateEngineMain.getFactory()) ;
Expand Down