archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 02:54:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8056052: Source.getContent() does excess Object.clone()

Browse source 
Reviewed-by: jlaskey, sundar
This commit is contained in:
Attila Szegedi 2014-08-26 15:04:48 +02:00
parent 5eb6a95a44
commit a72b265924
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Source.java
View file

@ -711,11 +711,16 @@ public final class Source implements Loggable {
} }
/** /**
* Get the content of this source as a char array * Get the content of this source as a char array. Note that the underlying array is returned instead of a
* @return content * clone; modifying the char array will cause modification to the source; this should not be done. While
* there is an apparent danger that we allow unfettered access to an underlying mutable array, the
* {@code Source} class is in a restricted {@code jdk.nashorn.internal.*} package and as such it is
* inaccessible by external actors in an environment with a security manager. Returning a clone would be
* detrimental to performance.
* @return content the content of this source as a char array
*/ */
public char[] getContent() { public char[] getContent() {
return data().clone(); return data();
} }
/** /**

3
nashorn/test/src/jdk/nashorn/internal/runtime/SourceTest.java
View file

@ -117,9 +117,6 @@ public class SourceTest {
assertEquals(str1, str2); assertEquals(str1, str2);
assertEquals(source1.hashCode(), source2.hashCode()); assertEquals(source1.hashCode(), source2.hashCode());
assertTrue(source1.equals(source2)); assertTrue(source1.equals(source2));
// Test for immutability
Arrays.fill(source1.getContent(), (char)0);
Arrays.fill(source2.getContent(), (char)1);
assertTrue(Arrays.equals(source1.getContent(), str1.toCharArray())); assertTrue(Arrays.equals(source1.getContent(), str1.toCharArray()));
assertTrue(Arrays.equals(source1.getContent(), chars1)); assertTrue(Arrays.equals(source1.getContent(), chars1));
assertTrue(Arrays.equals(source1.getContent(), source2.getContent())); assertTrue(Arrays.equals(source1.getContent(), source2.getContent()));