diff options
| author | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-09-14 12:22:11 -0700 |
|---|---|---|
| committer | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-09-14 12:22:11 -0700 |
| commit | 261b1c785668ae42a29d9217cc4a8f305a724e2f (patch) | |
| tree | 77024bdb9e9885b4cc84ea0095eaa84864caeb5d /src/reflect | |
| parent | 83c1b1062957e50e5336c1b3409e54e0a5cce275 (diff) | |
| parent | 47587dca4d3fb7c171cff21587b42f40bab77e21 (diff) | |
| download | scala-261b1c785668ae42a29d9217cc4a8f305a724e2f.tar.gz scala-261b1c785668ae42a29d9217cc4a8f305a724e2f.tar.bz2 scala-261b1c785668ae42a29d9217cc4a8f305a724e2f.zip | |
Merge pull request #1304 from paulp/topic/empty-array-optimization
Topic/empty array optimization
Diffstat (limited to 'src/reflect')
| -rw-r--r-- | src/reflect/scala/tools/nsc/io/VirtualFile.scala | 2 | ||||
| -rw-r--r-- | src/reflect/scala/tools/nsc/io/ZipArchive.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/reflect/scala/tools/nsc/io/VirtualFile.scala b/src/reflect/scala/tools/nsc/io/VirtualFile.scala index be888e92e6..9061534edc 100644 --- a/src/reflect/scala/tools/nsc/io/VirtualFile.scala +++ b/src/reflect/scala/tools/nsc/io/VirtualFile.scala @@ -33,7 +33,7 @@ class VirtualFile(val name: String, override val path: String) extends AbstractF //######################################################################## // Private data - private var content = new Array[Byte](0) + private var content = Byte.emptyArray //######################################################################## // Public Methods diff --git a/src/reflect/scala/tools/nsc/io/ZipArchive.scala b/src/reflect/scala/tools/nsc/io/ZipArchive.scala index d7ec209525..9d9d9a46f2 100644 --- a/src/reflect/scala/tools/nsc/io/ZipArchive.scala +++ b/src/reflect/scala/tools/nsc/io/ZipArchive.scala @@ -177,7 +177,7 @@ final class URLZipArchive(val url: URL) extends ZipArchive(null) { class FileEntry() extends Entry(zipEntry.getName) { override val toByteArray: Array[Byte] = { val len = zipEntry.getSize().toInt - val arr = new Array[Byte](len) + val arr = if (len == 0) Byte.emptyArray else new Array[Byte](len) var offset = 0 def loop() { |