diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2017-02-20 16:17:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-20 16:17:34 +0100 |
| commit | 23e5ed9219b503c6a394b28d014ea5c29893db8d (patch) | |
| tree | 982f832e86773b4ec66977008b5dd60ab75195d5 /src | |
| parent | cad3c3da3ea505b2e63878abad8df76365f999a4 (diff) | |
| parent | 96e8e9789ba05a591f8b8932b65ff90a5559e552 (diff) | |
| download | scala-23e5ed9219b503c6a394b28d014ea5c29893db8d.tar.gz scala-23e5ed9219b503c6a394b28d014ea5c29893db8d.tar.bz2 scala-23e5ed9219b503c6a394b28d014ea5c29893db8d.zip | |
Merge pull request #5707 from retronym/topic/java9-prepare
More groundwork for JDK 9 support
Diffstat (limited to 'src')
| -rw-r--r-- | src/reflect/scala/reflect/internal/util/AbstractFileClassLoader.scala | 2 | ||||
| -rw-r--r-- | src/repl/scala/tools/nsc/interpreter/Scripted.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/reflect/scala/reflect/internal/util/AbstractFileClassLoader.scala b/src/reflect/scala/reflect/internal/util/AbstractFileClassLoader.scala index 3cede1b3c5..49ab0cb30e 100644 --- a/src/reflect/scala/reflect/internal/util/AbstractFileClassLoader.scala +++ b/src/reflect/scala/reflect/internal/util/AbstractFileClassLoader.scala @@ -92,7 +92,7 @@ class AbstractFileClassLoader(val root: AbstractFile, parent: ClassLoader) } } - private val packages = mutable.Map[String, Package]() + private[this] val packages = mutable.Map[String, Package]() override def definePackage(name: String, specTitle: String, specVersion: String, specVendor: String, implTitle: String, implVersion: String, implVendor: String, sealBase: URL): Package = { throw new UnsupportedOperationException() diff --git a/src/repl/scala/tools/nsc/interpreter/Scripted.scala b/src/repl/scala/tools/nsc/interpreter/Scripted.scala index 6aef486957..8d87d98e53 100644 --- a/src/repl/scala/tools/nsc/interpreter/Scripted.scala +++ b/src/repl/scala/tools/nsc/interpreter/Scripted.scala @@ -331,7 +331,7 @@ class WriterOutputStream(writer: Writer) extends OutputStream { byteBuffer.flip() val result = decoder.decode(byteBuffer, charBuffer, /*eoi=*/ false) if (byteBuffer.remaining == 0) byteBuffer.clear() - if (charBuffer.position > 0) { + if (charBuffer.position() > 0) { charBuffer.flip() writer write charBuffer.toString charBuffer.clear() |