diff options
| author | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-09-17 05:01:22 -0700 |
|---|---|---|
| committer | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-09-17 05:01:22 -0700 |
| commit | 61c83d2903f1c68c943ea646e75b4ca32d75f991 (patch) | |
| tree | 0fcf7f24c3538fe0051a83e6f6dc3b3462f86cb6 /src/reflect | |
| parent | 9bcb335b8a08edb5cd88408e3f5be3fee6a7ca88 (diff) | |
| parent | 121f3a92ea86258ab8507c6a7759cd2242bebab6 (diff) | |
| download | scala-61c83d2903f1c68c943ea646e75b4ca32d75f991.tar.gz scala-61c83d2903f1c68c943ea646e75b4ca32d75f991.tar.bz2 scala-61c83d2903f1c68c943ea646e75b4ca32d75f991.zip | |
Merge pull request #1322 from paulp/topic/emptyArray
Topic/empty array
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 9061534edc..8a5114bfe7 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 = Byte.emptyArray + private var content = Array.emptyByteArray //######################################################################## // Public Methods diff --git a/src/reflect/scala/tools/nsc/io/ZipArchive.scala b/src/reflect/scala/tools/nsc/io/ZipArchive.scala index 9d9d9a46f2..49d2200895 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 = if (len == 0) Byte.emptyArray else new Array[Byte](len) + val arr = if (len == 0) Array.emptyByteArray else new Array[Byte](len) var offset = 0 def loop() { |