--- a/jdk/src/share/classes/sun/text/normalizer/ICUData.java	Mon Dec 05 10:50:14 2011 -0800
+++ b/jdk/src/share/classes/sun/text/normalizer/ICUData.java	Tue Dec 06 08:39:02 2011 +0900
@@ -48,12 +48,12 @@
  */
 public final class ICUData {
 
-    private static InputStream getStream(final Class root, final String resourceName, boolean required) {
+    private static InputStream getStream(final Class<ICUData> root, final String resourceName, boolean required) {
         InputStream i = null;
 
         if (System.getSecurityManager() != null) {
-            i = (InputStream)AccessController.doPrivileged(new PrivilegedAction() {
-                    public Object run() {
+            i = AccessController.doPrivileged(new PrivilegedAction<InputStream>() {
+                    public InputStream run() {
                         return root.getResourceAsStream(resourceName);
                     }
                 });