Conflicts:
	Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java
This commit is contained in:
adam-m 2013-06-13 13:08:50 -04:00
commit 5524ca766f
2 changed files with 2 additions and 2 deletions

View File

@ -53,7 +53,7 @@ public class ImageFilePanel extends ContentTypePanel implements DocumentListener
/** /**
* Returns the default instance of a ImageFilePanel. * Returns the default instance of a ImageFilePanel.
*/ */
public static ImageFilePanel getDefault() { public static synchronized ImageFilePanel getDefault() {
if (instance == null) { if (instance == null) {
instance = new ImageFilePanel(); instance = new ImageFilePanel();
instance.init(); instance.init();

View File

@ -61,7 +61,7 @@ public class LocalDiskPanel extends ContentTypePanel {
/** /**
* Get the default instance of this panel. * Get the default instance of this panel.
*/ */
public static LocalDiskPanel getDefault() { public static synchronized LocalDiskPanel getDefault() {
if (instance == null) { if (instance == null) {
instance = new LocalDiskPanel(); instance = new LocalDiskPanel();
instance.init(); instance.init();