Skip to content

Commit 270b530

Browse files
committed
scala: fixed default values of column's describing arrays to be not null
1 parent 8f1cd6d commit 270b530

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

RubyScript/src/org/knime/ext/jruby/RubyScriptNodeModel.scala

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ class RubyScriptNodeModel (
8686

8787
protected var appendCols: Boolean = true
8888

89-
protected var columnNames: Array[String] = _
90-
protected var columnTypes: Array[String] = _
89+
protected var columnNames = Array[String]()
90+
protected var columnTypes = Array[String]()
9191

9292
class ScriptError {
9393
var lineNum: Int = -1
@@ -107,7 +107,8 @@ class RubyScriptNodeModel (
107107
# Flow variables:
108108
# puts FlowVariableList['knime.workspace'] # reading
109109
# FlowVariableList['filename'] = '1.txt' # writing
110-
#"""
110+
#
111+
"""
111112

112113
protected val templateSnippet =
113114
"""#
@@ -351,8 +352,8 @@ end
351352
protected def loadValidatedSettingsFrom(settings: NodeSettingsRO) {
352353
script = settings.getString(SCRIPT)
353354
appendCols = settings.getBoolean(APPEND_COLS, true)
354-
columnNames = settings.getStringArray(COLUMN_NAMES)
355-
columnTypes = settings.getStringArray(COLUMN_TYPES)
355+
columnNames = Option(settings.getStringArray(COLUMN_NAMES)).getOrElse(Array())
356+
columnTypes = Option(settings.getStringArray(COLUMN_TYPES)).getOrElse(Array())
356357
script_error = new ScriptError()
357358
}
358359

0 commit comments

Comments
 (0)