diff --git a/jdk/src/share/classes/java/net/URL.java b/jdk/src/share/classes/java/net/URL.java index 7e3af285821..86d0bf78794 100644 --- a/jdk/src/share/classes/java/net/URL.java +++ b/jdk/src/share/classes/java/net/URL.java @@ -1055,7 +1055,7 @@ public final class URL implements java.io.Serializable { /** * Gets the contents of this URL. This method is a shorthand for: *
- * openConnection().getContent(Class[])
+ * openConnection().getContent(classes)
*
*
* @param classes an array of Java types
@@ -1066,7 +1066,7 @@ public final class URL implements java.io.Serializable {
* @see java.net.URLConnection#getContent(Class[])
* @since 1.3
*/
- public final Object getContent(Class[] classes)
+ public final Object getContent(Class>[] classes)
throws java.io.IOException {
return openConnection().getContent(classes);
}
diff --git a/jdk/src/share/classes/java/net/URLConnection.java b/jdk/src/share/classes/java/net/URLConnection.java
index dd66ed26c54..eb98672e826 100644
--- a/jdk/src/share/classes/java/net/URLConnection.java
+++ b/jdk/src/share/classes/java/net/URLConnection.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 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
@@ -760,7 +760,7 @@ public abstract class URLConnection {
* @see java.net.URLConnection#setContentHandlerFactory(java.net.ContentHandlerFactory)
* @since 1.3
*/
- public Object getContent(Class[] classes) throws IOException {
+ public Object getContent(Class>[] classes) throws IOException {
// Must call getInputStream before GetHeaderField gets called
// so that FileNotFoundException has a chance to be thrown up
// from here without being caught.