changeset 8182:a88254c70ad6

Automated merge with http://hg.openjdk.java.net/jdk8/tl/jdk
author wmdietl
date Sun, 15 Sep 2013 00:43:32 -0700
parents 35bb1c7f227c b3f9bb0ef8fe
children cec2d862b916
files src/share/classes/java/lang/Class.java src/share/classes/java/lang/reflect/Executable.java
diffstat 3 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sat Sep 14 13:55:06 2013 -0400
+++ b/.hgtags	Sun Sep 15 00:43:32 2013 -0700
@@ -146,6 +146,7 @@
 dda27c73d8db4a9c7a23872b6f0c5106edcb2021 jdk8-b22
 54202e0148ec7d4570cab5bc9b00d216a7677569 jdk8-b23
 34029a0c69bba882264a29fc822f8283fd15f104 jdk8-b24
+8da468cf037b6ea0eb2212dac7491efd59754d79 308-jdk8-sync
 ec17fbe5b8fbc52da070eec43b4711d9354b2ab8 jdk8-b25
 5aca406e87cb9144a9405be312dadd728a9c6fe2 jdk8-b26
 c68342532e2e7deb3a25fc04ed3e4c142278f747 jdk8-b27
--- a/src/share/classes/java/lang/reflect/Field.java	Sat Sep 14 13:55:06 2013 -0400
+++ b/src/share/classes/java/lang/reflect/Field.java	Sun Sep 15 00:43:32 2013 -0700
@@ -1164,5 +1164,5 @@
                                                        getDeclaringClass(),
                                                        getGenericType(),
                                                        TypeAnnotation.TypeAnnotationTarget.FIELD);
+    }
 }
-}
--- a/src/share/classes/java/lang/reflect/Modifier.java	Sat Sep 14 13:55:06 2013 -0400
+++ b/src/share/classes/java/lang/reflect/Modifier.java	Sun Sep 15 00:43:32 2013 -0700
@@ -357,7 +357,7 @@
     // that would allow the values to be treated as Java-level
     // constants since the values could be constant folded and updates
     // to the sets of modifiers missed. Thus, the fooModifiers()
-    // methods return an unchanging values for a given release, but a
+    // methods return an unchanging value for a given release, but a
     // value that can potentially change over time.
 
     /**