@@ -311,7 +311,7 @@ private void postProcess(final OIData oiData) {
311311 logger .log (Level .FINE , "postProcess: OIData[{0}]" , oiData );
312312 }
313313
314- processStaIndexAndStaConfNames (oiData );
314+ processStaIndexNames (oiData );
315315 }
316316
317317 /**
@@ -434,15 +434,15 @@ private void process(final OITarget oiTarget) {
434434
435435 // --- baseline / configuration processing
436436 /**
437- * Computes station index and conf names on the given OIData table
437+ * Computes station index names on the given OIData table
438438 * @param oiData OIData table to process
439439 */
440- private void processStaIndexAndStaConfNames (final OIData oiData ) {
440+ private void processStaIndexNames (final OIData oiData ) {
441441 final OIFitsFile oiFitsFile = oiData .getOIFitsFile ();
442442 final Map <String , StaNamesDir > usedStaNamesMap = oiFitsFile .getUsedStaNamesMap ();
443443
444444 if (isLogDebug ) {
445- logger .log (Level .FINE , "processStaIndexAndStaConfNames : OIData[{0}] usedStaNamesMap: {1}" ,
445+ logger .log (Level .FINE , "processStaIndexNames : OIData[{0}] usedStaNamesMap: {1}" ,
446446 new Object []{oiData .idToString (), usedStaNamesMap .entrySet ()});
447447 }
448448
@@ -451,16 +451,18 @@ private void processStaIndexAndStaConfNames(final OIData oiData) {
451451 if (nRows != 0 ) {
452452 // StaIndex column:
453453 final short [][] staIndexes = oiData .getStaIndex ();
454+
455+ if (staIndexes != null ) {
456+ // Derived StaIndexName column:
457+ final String [] staIndexNames = oiData .getStaIndexName ();
454458
455- // Derived StaIndexName column:
456- final String [] staIndexNames = oiData .getStaIndexName ();
457-
458- for (int i = 0 ; i < nRows ; i ++) {
459- staIndexNames [i ] = oiData .getRealStaNames (usedStaNamesMap , staIndexes [i ]);
460- }
459+ for (int i = 0 ; i < nRows ; i ++) {
460+ staIndexNames [i ] = oiData .getRealStaNames (usedStaNamesMap , staIndexes [i ]);
461+ }
461462
462- if (isLogDebug ) {
463- logger .log (Level .FINE , "processStaIndexAndStaConfNames: OIData[{0}] done" , oiData .idToString ());
463+ if (isLogDebug ) {
464+ logger .log (Level .FINE , "processStaIndexNames: OIData[{0}] done" , oiData .idToString ());
465+ }
464466 }
465467 }
466468 }
0 commit comments