diff --git a/jdk/src/share/classes/java/security/Provider.java b/jdk/src/share/classes/java/security/Provider.java index 7e3def8f516..d7e08267b20 100644 --- a/jdk/src/share/classes/java/security/Provider.java +++ b/jdk/src/share/classes/java/security/Provider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1405,7 +1405,7 @@ public abstract class Provider extends Properties { private String[] supportedFormats; // names of the supported key (super) classes - private Class[] supportedClasses; + private Class<?>[] supportedClasses; // whether this service has been registered with the Provider private boolean registered; @@ -1656,7 +1656,7 @@ public abstract class Provider extends Properties { return o; } Class<?> argClass = constructorParameter.getClass(); - Constructor[] cons = clazz.getConstructors(); + Constructor<?>[] cons = clazz.getConstructors(); // find first public constructor that can take the // argument as parameter for (int i = 0; i < cons.length; i++) { diff --git a/jdk/src/share/classes/java/security/UnresolvedPermission.java b/jdk/src/share/classes/java/security/UnresolvedPermission.java index 6c400382dfe..98ab2d13f9f 100644 --- a/jdk/src/share/classes/java/security/UnresolvedPermission.java +++ b/jdk/src/share/classes/java/security/UnresolvedPermission.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -216,9 +216,9 @@ implements java.io.Serializable } - private static final Class[] PARAMS0 = { }; - private static final Class[] PARAMS1 = { String.class }; - private static final Class[] PARAMS2 = { String.class, String.class }; + private static final Class<?>[] PARAMS0 = { }; + private static final Class<?>[] PARAMS1 = { String.class }; + private static final Class<?>[] PARAMS2 = { String.class, String.class }; /** * try and resolve this permission using the class loader of the permission