Fixed a bug that resulted in an unhelpful NPE when the named source of training data is not present in the transformation.

Mark Hall · Mark Hall · commit db1003041137 · 2019-10-23T12:17:09.000+13:00
diff --git a/src/main/java/org/pentaho/di/trans/steps/pmi/BaseSupervisedPMIStep.java b/src/main/java/org/pentaho/di/trans/steps/pmi/BaseSupervisedPMIStep.java
@@ -137,12 +137,13 @@ public BaseSupervisedPMIStep( StepMeta stepMeta, StepDataInterface stepDataInter
         if ( infoStreams.size() == 0 ) {
           throw new KettleException( BaseMessages.getString( PKG, "BasePMIStep.Error.NoIncomingData" ) );
         }
+        String trainingInputStepName = environmentSubstitute( m_meta.getTrainingStepInputName() );
         if ( infoStreams.size() > 1 ) {
           // check that there is a training stream named
           if ( Const.isEmpty( m_meta.getTrainingStepInputName() ) ) {
             throw new KettleException( BaseMessages.getString( PKG, "BasePMIStep.Error.NoTrainingInputStep" ) );
           }
-          String trainingInputStepName = environmentSubstitute( m_meta.getTrainingStepInputName() );
+
           boolean trainingMatch = false;
           for ( StreamInterface input : infoStreams ) {
             if ( input.getSubject().toString().equals( trainingInputStepName ) ) {
@@ -174,6 +175,10 @@ public BaseSupervisedPMIStep( StepMeta stepMeta, StepDataInterface stepDataInter
           }
         } else {
           m_data.m_trainingStream = infoStreams.get( 0 );
+          if ( m_data.m_trainingStream == null ) {
+            throw new KettleException( BaseMessages
+                .getString( PKG, "BasePMIStep.Error.UnableToFindNamedTrainingSource", trainingInputStepName ) );
+          }
         }
 
         m_data.m_trainingRowMeta = getTransMeta().getStepFields( (String) m_data.m_trainingStream.getSubject() );

Original file line number	Diff line number	Diff line change
`@@ -137,12 +137,13 @@ public BaseSupervisedPMIStep( StepMeta stepMeta, StepDataInterface stepDataInter`
`137`	`137`	`if ( infoStreams.size() == 0 ) {`
`138`	`138`	`throw new KettleException( BaseMessages.getString( PKG, "BasePMIStep.Error.NoIncomingData" ) );`
`139`	`139`	`}`
	`140`	`+ String trainingInputStepName = environmentSubstitute( m_meta.getTrainingStepInputName() );`
`140`	`141`	`if ( infoStreams.size() > 1 ) {`
`141`	`142`	`// check that there is a training stream named`
`142`	`143`	`if ( Const.isEmpty( m_meta.getTrainingStepInputName() ) ) {`
`143`	`144`	`throw new KettleException( BaseMessages.getString( PKG, "BasePMIStep.Error.NoTrainingInputStep" ) );`
`144`	`145`	`}`
`145`		`- String trainingInputStepName = environmentSubstitute( m_meta.getTrainingStepInputName() );`
	`146`	`+`
`146`	`147`	`boolean trainingMatch = false;`
`147`	`148`	`for ( StreamInterface input : infoStreams ) {`
`148`	`149`	`if ( input.getSubject().toString().equals( trainingInputStepName ) ) {`
`@@ -174,6 +175,10 @@ public BaseSupervisedPMIStep( StepMeta stepMeta, StepDataInterface stepDataInter`
`174`	`175`	`}`
`175`	`176`	`} else {`
`176`	`177`	`m_data.m_trainingStream = infoStreams.get( 0 );`
	`178`	`+ if ( m_data.m_trainingStream == null ) {`
	`179`	`+ throw new KettleException( BaseMessages`
	`180`	`+ .getString( PKG, "BasePMIStep.Error.UnableToFindNamedTrainingSource", trainingInputStepName ) );`
	`181`	`+ }`
`177`	`182`	`}`
`178`	`183`
`179`	`184`	`m_data.m_trainingRowMeta = getTransMeta().getStepFields( (String) m_data.m_trainingStream.getSubject() );`