summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jakob@odersky.com>2016-07-22 18:34:47 -0700
committerJakob Odersky <jakob@odersky.com>2016-07-26 11:30:26 -0700
commitd39ce7a66ad1d24d620339a90293c6f4d86de1dc (patch)
tree1b0b89d209de6ca7f53cbd1e99833fc763e82010
parent1e7ce6e774f2428356887d71870557b67062ef7f (diff)
downloadscala-d39ce7a66ad1d24d620339a90293c6f4d86de1dc.tar.gz
scala-d39ce7a66ad1d24d620339a90293c6f4d86de1dc.tar.bz2
scala-d39ce7a66ad1d24d620339a90293c6f4d86de1dc.zip
Javadoc: fix initialization NPE in doc headers
-rw-r--r--src/scaladoc/scala/tools/nsc/doc/ScaladocAnalyzer.scala7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/scaladoc/scala/tools/nsc/doc/ScaladocAnalyzer.scala b/src/scaladoc/scala/tools/nsc/doc/ScaladocAnalyzer.scala
index 2152ce234a..d8ec7b18fd 100644
--- a/src/scaladoc/scala/tools/nsc/doc/ScaladocAnalyzer.scala
+++ b/src/scaladoc/scala/tools/nsc/doc/ScaladocAnalyzer.scala
@@ -216,11 +216,16 @@ abstract class ScaladocSyntaxAnalyzer[G <: Global](val global: G) extends Syntax
class ScaladocJavaUnitScanner(unit: CompilationUnit) extends JavaUnitScanner(unit) {
- private val docBuffer: StringBuilder = new StringBuilder
+ private var docBuffer: StringBuilder = _
private var inDocComment = false
private var docStart: Int = 0
private var lastDoc: DocComment = null
+ override def init() = {
+ docBuffer = new StringBuilder
+ super.init()
+ }
+
// get last doc comment
def flushDoc(): DocComment = try lastDoc finally lastDoc = null