CORE-13335: PR feedback

(cherry picked from commit e2a1cbf)

Author: samuelraeburn

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

@@ -35,24 +35,20 @@ int process_data(dds::sub::DataReader<keys> reader)
                       << ", x: " << sample.data().x()
                       << ", y: " << sample.data().y() << std::endl;
         } else {
-            // A sample without valid data can be in any instance state, but the
-            // key value is only available if it is ALIVE or NOT_ALIVE_DISPOSED
+            keys sample;
+            reader.key_value(sample, info.instance_handle());
             const dds::sub::status::InstanceState &state =
                     info.state().instance_state();
             if (state
                 == dds::sub::status::InstanceState::not_alive_no_writers()) {
-                std::cout
-                        << "Instance is in NOT_ALIVE_NO_WRITERS instance state"
+                std::cout << "Instance " << sample.code() << " has no writers"
                         << std::endl;
+            } else if (state
+                == dds::sub::status::InstanceState::not_alive_disposed()) {
+                std::cout << "Instance " << sample.code() << " is disposed"
+                          << std::endl;
             } else {
-                // Since there is not valid data, it may include metadata.
-                keys sample;
-                reader.key_value(sample, info.instance_handle());
-                std::cout << "Instance " << sample.code() << " is "
-                          << ((state
-                               == dds::sub::status::InstanceState::alive())
-                                      ? "alive"
-                                      : "disposed")
+                std::cout << "Instance " << sample.code() << " is alive"
                           << std::endl;
             }
         }

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

@@ -55,28 +55,29 @@ unsigned int process_data(keysDataReader *typed_reader)
 
             samples_read++;
         } else {
-            /*
-             * An invalid sample can be in any instance state. The key value is
-             * only available if it is ALIVE or NOT_ALIVE_DISPOSED.
-             */
+            /* An invalid sample can be in any instance state. */
+            keys dummy;
+            retcode = typed_reader->get_key_value(
+                    dummy,
+                    info_seq[i].instance_handle);
+            if (retcode != DDS_RETCODE_OK) {
+                std::cout << "get_key_value error " << retcode << std::endl;
+                continue;
+            }
             if (info_seq[i].instance_state
                 == DDS_NOT_ALIVE_NO_WRITERS_INSTANCE_STATE) {
-                std::cout << "Instance has no writers" << std::endl;
+                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 << " is disposed"
+                        << std::endl;
             } else {
-                keys dummy;
-                retcode = typed_reader->get_key_value(
-                        dummy,
-                        info_seq[i].instance_handle);
-                if (retcode != DDS_RETCODE_OK) {
-                    std::cout << "get_key_value error " << retcode << std::endl;
-                    continue;
-                }
-                std::cout << "Instance " << dummy.code << " is "
-                          << ((info_seq[i].instance_state
-                               == DDS_ALIVE_INSTANCE_STATE)
-                                      ? "alive"
-                                      : "disposed")
-                          << std::endl;
+                std::cout
+                        << "Instance " << dummy.code << " is alive"
+                        << std::endl;
             }
         }
         /* End changes for Keyed_Data */

examples/connext_dds/keyed_data/c/keys_subscriber.c

@@ -148,30 +148,24 @@ 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 {
-            printf("No valid data for sample\n");
-            /*
-             * An invalid data sample can be in any instance state. The key
-             * value may be available if the instance is either ALIVE or
-             * NOT_ALIVE_DISPOSED.
-             */
+            /* An invalid data sample can be in any instance state. */
+            keys key_value;
+            retcode = keysDataReader_get_key_value(
+                    keys_reader,
+                    &key_value,
+                    &info->instance_handle);
+            if (retcode != DDS_RETCODE_OK) {
+                printf("get_key_value error %d\n", retcode);
+                continue;
+            }
             if (info->instance_state
                 == DDS_NOT_ALIVE_NO_WRITERS_INSTANCE_STATE) {
-                printf("Instance is in NOT_ALIVE_NO_WRITERS instance state\n");
+                printf("Instance %d has no writers\n", key_value.code);
+            } else if (info->instance_state 
+                == DDS_NOT_ALIVE_DISPOSED_INSTANCE_STATE) {
+                printf("Instance %d is disposed\n", key_value.code);
             } else {
-                keys key_value;
-                retcode = keysDataReader_get_key_value(
-                        keys_reader,
-                        &key_value,
-                        &info->instance_handle);
-                if (retcode != DDS_RETCODE_OK) {
-                    printf("get_key_value error %d\n", retcode);
-                    continue;
-                }
-                printf("Instance %d is in %s instance state\n",
-                       key_value.code,
-                       ((info->instance_state == DDS_ALIVE_INSTANCE_STATE)
-                                ? "ALIVE"
-                                : "NOT_ALIVE_DISPOSED"));
+                printf("Instance %d is alive\n", key_value.code);
             }
         }
         /* End changes for Keyed_Data */

examples/connext_dds/keyed_data/java/keysSubscriber.java

@@ -67,25 +67,21 @@ private int processData()
                             "Instance " + sample.code + ": x: " + sample.x
                             + ", y: " + sample.y + "\n");
                 } else {
+                    keys dummy = new keys();
+                    reader.get_key_value(dummy, info.instance_handle);
                     if (info.instance_state
                         == InstanceStateKind
                                    .NOT_ALIVE_NO_WRITERS_INSTANCE_STATE) {
-                        System.out.print("Instance has no writers\n");
+                        System.out.print(
+                                "Instance " + dummy.code + " has no writers\n");
+                    } else if (info.instance_state
+                        == InstanceStateKind
+                                   .NOT_ALIVE_DISPOSED_INSTANCE_STATE) {
+                        System.out.print(
+                                "Instance " + dummy.code + " is disposed\n");
                     } else {
-                        keys dummy = new keys();
-                        reader.get_key_value(dummy, info.instance_handle);
-                        if (info.instance_state
-                            == InstanceStateKind.ALIVE_INSTANCE_STATE) {
-                            System.out.print(
-                                    "Instance " + dummy.code + " is ALIVE\n");
-                        } else if (
-                                info.instance_state
-                                == InstanceStateKind
-                                           .NOT_ALIVE_DISPOSED_INSTANCE_STATE) {
-                            System.out.print(
-                                    "Instance " + dummy.code
-                                    + " is disposed\n");
-                        }
+                        System.out.print(
+                                "Instance " + dummy.code + " is alive\n");
                     }
                 }
                 samplesRead++;