53185: [Decorators] NPE and SWTException while applying decorationsRoot_branch_20040301_changeLogModelProvider

1 files changed, 4 insertions, 3 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
index 7c9f7694e..e9334f94d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
@@ -104,6 +104,10 @@ public class CVSUIPlugin extends AbstractUIPlugin {
 	 */
 	public CVSUIPlugin(IPluginDescriptor descriptor) {
 		super(descriptor);
+		// Initialize the images before the singleton is set
+		// to avoid accesses before they are initialized
+		initializeImages();
+		initializePreferences();
 		plugin = this;
 	}
 	
@@ -678,9 +682,6 @@ public class CVSUIPlugin extends AbstractUIPlugin {
 		Platform.getAdapterManager().registerAdapters(factory, ICVSRepositoryLocation.class);
 		Platform.getAdapterManager().registerAdapters(factory, RepositoryRoot.class);
 		
-		initializeImages();
-		initializePreferences();
-		
 		console = new CVSOutputConsole();
 		ConsolePlugin.getDefault().getConsoleManager().addConsoles(new IConsole[] {console});
 	}