Commit f95c095
committed
fixes #122: Avoid potential deadlock when loading plugin
If this plugin is being loaded when Openfire has already started, avoid initializing `initializeClustering` as part of the plugin initialization.
The plugin initialization locks the plugin manager. `initializeClustering` needs to obtain resources from the plugin manager (which it can't get while it's locked).
By making the `initializeClustering` method asynchronous, it no longer prevents the plugin initialization from completing, thus breaking the deadlock.1 parent 91bf801 commit f95c095
File tree
3 files changed
+5
-3
lines changed- src/java/org/jivesoftware/openfire/plugin
3 files changed
+5
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
| 48 | + | |
48 | 49 | | |
49 | 50 | | |
50 | 51 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
Lines changed: 3 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
| 2 | + | |
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| 24 | + | |
24 | 25 | | |
25 | 26 | | |
26 | 27 | | |
| |||
55 | 56 | | |
56 | 57 | | |
57 | 58 | | |
58 | | - | |
| 59 | + | |
59 | 60 | | |
60 | 61 | | |
61 | 62 | | |
| |||
0 commit comments