From 0e86f803ddacb98d58b550697330ceb40e44e759 Mon Sep 17 00:00:00 2001
From: dcherepanov <unknown>
Date: Thu, 23 Jul 2009 11:30:49 +0400
Subject: [PATCH] 6857870: Regression tests are failing with
 ExceptionInInitializerError Reviewed-by: art

---
 src/windows/classes/sun/awt/windows/WToolkit.java | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/windows/classes/sun/awt/windows/WToolkit.java b/src/windows/classes/sun/awt/windows/WToolkit.java
index 6e12209f9..9fcf3d67a 100644
--- a/src/windows/classes/sun/awt/windows/WToolkit.java
+++ b/src/windows/classes/sun/awt/windows/WToolkit.java
@@ -886,14 +886,12 @@ public class WToolkit extends SunToolkit implements Runnable {
      * this should be done in lazilyLoadDesktopProperty() only.
      */
     protected synchronized void initializeDesktopProperties() {
-        desktopProperties.put("DnD.Autoscroll.initialDelay",     Integer.valueOf(50));
-        desktopProperties.put("DnD.Autoscroll.interval",         Integer.valueOf(50));
-
-        try {
-            desktopProperties.put("Shell.shellFolderManager",
-                                  Class.forName("sun.awt.shell.Win32ShellFolderManager2"));
-        } catch (ClassNotFoundException ex) {
-        }
+        desktopProperties.put("DnD.Autoscroll.initialDelay",
+                              Integer.valueOf(50));
+        desktopProperties.put("DnD.Autoscroll.interval",
+                              Integer.valueOf(50));
+        desktopProperties.put("Shell.shellFolderManager",
+                              "sun.awt.shell.Win32ShellFolderManager2");
     }
 
     /*
-- 
GitLab