Merge pull request #668 from samuelraeburn/feature/CORE-13335-730

 CORE-13335: Fix examples that assume invalid data cannot be ALIVE

Author: samuelraeburn

examples/connext_dds/keyed_data/c++11/keys_subscriber.cxx

@@ -35,12 +35,8 @@ int process_data(dds::sub::DataReader<keys> reader)
                       << ", x: " << sample.data().x()
                       << ", y: " << sample.data().y() << std::endl;
         } else {
-            // Since there is not valid data, it may include metadata.
             keys sample;
             reader.key_value(sample, info.instance_handle());
-
-            // Here we print a message if the instance state is
-            // 'not_alive_no_writers' or 'not_alive_disposed'.
             const dds::sub::status::InstanceState &state =
                     info.state().instance_state();
             if (state
@@ -50,7 +46,10 @@ int process_data(dds::sub::DataReader<keys> reader)
             } else if (
                     state
                     == dds::sub::status::InstanceState::not_alive_disposed()) {
-                std::cout << "Instance " << sample.code() << " disposed"
+                std::cout << "Instance " << sample.code() << " is disposed"
+                          << std::endl;
+            } else {
+                std::cout << "Instance " << sample.code() << " is alive"
                           << std::endl;
             }
         }

examples/connext_dds/keyed_data/c++98/keys_subscriber.cxx

@@ -55,7 +55,7 @@ unsigned int process_data(keysDataReader *typed_reader)
 
             samples_read++;
         } else {
-            /* Since there is not valid data, it may include metadata */
+            /* An invalid sample can be in any instance state. */
             keys dummy;
             retcode = typed_reader->get_key_value(
                     dummy,
@@ -64,16 +64,18 @@ unsigned int process_data(keysDataReader *typed_reader)
                 std::cout << "get_key_value error " << retcode << std::endl;
                 continue;
             }
-
-            /* Here we print a message if the instance state is ALIVE_NO_WRITERS
-             * or ALIVE_DISPOSED */
             if (info_seq[i].instance_state
                 == DDS_NOT_ALIVE_NO_WRITERS_INSTANCE_STATE) {
-                std::cout << "Instance " << dummy.code << " has no writers\n";
+                std::cout << "Instance " << dummy.code << " has no writers"
+                          << std::endl;
             } else if (
                     info_seq[i].instance_state
                     == DDS_NOT_ALIVE_DISPOSED_INSTANCE_STATE) {
-                std::cout << "Instance " << dummy.code << " disposed\n";
+                std::cout << "Instance " << dummy.code << " is disposed"
+                          << std::endl;
+            } else {
+                std::cout << "Instance " << dummy.code << " is alive"
+                          << std::endl;
             }
         }
         /* End changes for Keyed_Data */

examples/connext_dds/keyed_data/c/keys_subscriber.c

@@ -148,26 +148,25 @@ void keysListener_on_data_available(void *listener_data, DDS_DataReader *reader)
             printf("Instance %d: x: %d, y: %d\n", data->code, data->x, data->y);
 
         } else {
-            /* Since there is not valid data, it may include metadata */
-            keys dummy;
+            /* An invalid data sample can be in any instance state. */
+            keys key_value;
             retcode = keysDataReader_get_key_value(
                     keys_reader,
-                    &dummy,
+                    &key_value,
                     &info->instance_handle);
             if (retcode != DDS_RETCODE_OK) {
                 printf("get_key_value error %d\n", retcode);
                 continue;
             }
-
-            /* Here we print a message if the instance state is ALIVE_NO_WRITERS
-             * or ALIVE_DISPOSED */
             if (info->instance_state
                 == DDS_NOT_ALIVE_NO_WRITERS_INSTANCE_STATE) {
-                printf("Instance %d has no writers\n", dummy.code);
+                printf("Instance %d has no writers\n", key_value.code);
             } else if (
                     info->instance_state
                     == DDS_NOT_ALIVE_DISPOSED_INSTANCE_STATE) {
-                printf("Instance %d disposed\n", dummy.code);
+                printf("Instance %d is disposed\n", key_value.code);
+            } else {
+                printf("Instance %d is alive\n", key_value.code);
             }
         }
         /* End changes for Keyed_Data */

examples/connext_dds/keyed_data/java/keysPublisher.java

@@ -105,7 +105,7 @@ private void runApplication()
         instance[2].code = 2;
 
         // The keys must have been set before making this call
-        System.out.println("Registering instance" + instance[0].code);
+        System.out.println("Registering instance " + instance[0].code);
         handle[0] = writer.register_instance(instance[0]);
 
         // Modify the data to be sent here

examples/connext_dds/keyed_data/java/keysSubscriber.java

@@ -67,12 +67,8 @@ private int processData()
                             "Instance " + sample.code + ": x: " + sample.x
                             + ", y: " + sample.y + "\n");
                 } else {
-                    // Since there is not valid data, it may include metadata
                     keys dummy = new keys();
                     reader.get_key_value(dummy, info.instance_handle);
-
-                    // Here we print a message if the instance state is
-                    // ALIVE_NO_WRITERS or ALIVE_DISPOSED
                     if (info.instance_state
                         == InstanceStateKind
                                    .NOT_ALIVE_NO_WRITERS_INSTANCE_STATE) {
@@ -83,7 +79,10 @@ private int processData()
                             == InstanceStateKind
                                        .NOT_ALIVE_DISPOSED_INSTANCE_STATE) {
                         System.out.print(
-                                "Instance " + dummy.code + " disposed\n");
+                                "Instance " + dummy.code + " is disposed\n");
+                    } else {
+                        System.out.print(
+                                "Instance " + dummy.code + " is alive\n");
                     }
                 }
                 samplesRead++;