[MOAB-dev] r3983 - MOAB/trunk/src/parallel

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-05-29 19:02:15 -0500 (Sat, 29 May 2010)
New Revision: 3983

Modified:
   MOAB/trunk/src/parallel/ReadParallel.cpp
Log:
fix bug in previous checkin

Modified: MOAB/trunk/src/parallel/ReadParallel.cpp
===================================================================
--- MOAB/trunk/src/parallel/ReadParallel.cpp	2010-05-29 23:49:11 UTC (rev 3982)
+++ MOAB/trunk/src/parallel/ReadParallel.cpp	2010-05-30 00:02:15 UTC (rev 3983)
@@ -366,11 +366,19 @@
               parts.num_tag_values = partition_tag_vals.size();
             }
           }
-          std::vector<ReaderIface::IDTag> subset( subset_list->tag_list, 
-                                subset_list->tag_list + subset_list->tag_list_length );
-          subset.push_back( parts );
-          sl.tag_list = &subset[0];
-          sl.tag_list_length = subset.size();
+          std::vector<ReaderIface::IDTag> subset;
+          if (subset_list) {
+            std::vector<ReaderIface::IDTag> tmplist( subset_list->tag_list, 
+                           subset_list->tag_list + subset_list->tag_list_length );
+            tmplist.push_back( parts );
+            subset.swap(tmplist);
+            sl.tag_list = &subset[0];
+            sl.tag_list_length = subset.size();
+          }
+          else {
+            sl.tag_list = &parts;
+            sl.tag_list_length = 1;
+          }
           tmp_result = impl->serial_load_file( *file_names, &file_set, opts, &sl, file_id_tag );
           
           if (MB_SUCCESS == tmp_result)