Skip to content

Commit

Permalink
FELIX-5716: Applied the patch attached to the jira issue.
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1828022 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Pierre De Rop committed Mar 29, 2018
1 parent f86428f commit 4354733
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -185,17 +185,11 @@ void trackInitial() {
continue; /* skip this item */
}
adding.add(item);
final AbstractCustomizerActionSet actionSet = trackAdding(item, null);
m_executor.schedule(new Runnable() {

@Override
public void run() {
actionSet.execute();

}

});
}

final AbstractCustomizerActionSet actionSet = trackAdding(item, null);
m_executor.schedule(() -> actionSet.execute());

if (DEBUG) {
System.out.println("AbstractTracked.trackInitial: " + item); //$NON-NLS-1$
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -382,10 +382,6 @@ public void open(boolean trackAllServices, boolean trackAllAspects) {
/* set tracked with the initial references */
t.setInitial(references);

// only actually schedules the actions for execution within this synchronized block,
// but do the actual execution afterwards.
t.trackInitial();

}
catch (InvalidSyntaxException e) {
throw new RuntimeException(
Expand All @@ -396,7 +392,11 @@ public void open(boolean trackAllServices, boolean trackAllAspects) {
tracked = t;
}
/* Call tracked outside of synchronized region */
// just trigger the executor

// schedule trackInitial call: this method will invoke "addingService" customizer callbacks, but will schedule other customizer callbacks (added/modified/removed).
t.getExecutor().schedule(() -> t.trackInitial());

// Just trigger the execution of everything, but serially.
t.getExecutor().execute();
}

Expand Down

0 comments on commit 4354733

Please sign in to comment.