Changeset 2304

Timestamp:

09/16/11 15:12:01 (13 years ago)

Author:

Takeshi Nakazato

Message:

Merge bug fix on trunk (r2303).

Location:

branches/casa-prerelease/pre-asap

Files:

• . (modified) (1 prop)
• Makefile (modified) (1 prop)
• SConstruct (modified) (1 prop)
• apps (modified) (1 prop)
• external-alma (modified) (1 prop)
• external-alma/atnf/pks/pks_maths.cc (modified) (1 prop)
• getsvnrev.sh (modified) (1 prop)
• python (modified) (1 prop)
• src (modified) (1 prop)
• src/MSFiller.cpp (modified) (1 diff)
• src/SConscript (modified) (1 prop)

branches/casa-prerelease/pre-asap/src/MSFiller.cpp

@@ -1606 +1606 @@
     if ( id.size() > 0 )
       antenna_ = id[0] ;
+    else {
+      delete tmpMS ;
+      //throw( AipsError( "Antenna " + antennaStr_ + " doesn't exist." ) ) ;
+      os_ << LogIO::SEVERE << "Antenna " << antennaStr_ << " doesn't exist." << LogIO::POST ;
+      return False ;
+    }
   }