Changeset 2705 for trunk/external-alma

Timestamp:

12/20/12 19:51:04 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CSV-2216

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: run importasdm with singledish=True

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Bug fix on ASDMReader::setMainRow. Handling the case when
asdm::MainTable.getByContext() returns null pointer.

File:

• trunk/external-alma/asdm2ASAP/ASDMReader.cc (modified) (1 diff)

trunk/external-alma/asdm2ASAP/ASDMReader.cc

@@ -551 +551 @@
   Tag configDescTag( (unsigned int)configDescId, TagType::ConfigDescription ) ;
   Tag fieldTag( (unsigned int)fieldId, TagType::Field ) ;
-  mainRow_ = casa::Vector<MainRow *>( *(asdm_->getMain().getByContext( configDescTag, fieldTag ) ) ) ;
+  vector<MainRow *> *rows = asdm_->getMain().getByContext( configDescTag, fieldTag );
+  if (rows == 0)
+    return false;
+  mainRow_ = casa::Vector<MainRow *>( *rows ) ;
   
   return true ;