diff -r 8ef36e90e291 options.api/src/org/netbeans/modules/options/advanced/AdvancedPanelController.java --- a/options.api/src/org/netbeans/modules/options/advanced/AdvancedPanelController.java Wed Mar 09 06:22:34 2011 +0300 +++ b/options.api/src/org/netbeans/modules/options/advanced/AdvancedPanelController.java Fri Mar 11 19:49:03 2011 +0300 @@ -95,8 +95,9 @@ } public JComponent getComponent (Lookup masterLookup) { - getAdvancedPanel().init(); - return getAdvancedPanel (); + AdvancedPanel p = getAdvancedPanel(); + p.init(); + return p; } @Override @@ -120,7 +121,7 @@ private AdvancedPanel advancedPanel; - private AdvancedPanel getAdvancedPanel () { + private synchronized AdvancedPanel getAdvancedPanel () { if (advancedPanel == null) advancedPanel = new AdvancedPanel(subpath); return advancedPanel;