diff --git a/RELEASE_NOTES b/RELEASE_NOTES index d9da2ce46..3fac59588 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -67,6 +67,7 @@ Bugs fixed - Bug 1855 - SixLowPanNetDevice is not correctly indexed - Bug 1862 - NS_LOG="Time=*|prefix_time" causes stack overflow - Bug 1870 - Remove unnecessary AsInt functions +- Bug 1873 - Energy source checked to be aggregated to the node - Bug 1874 - Ipv4L3Protocol::ProcessFragment: addressCombination and idProto identifiers not properly computed - Bug 1882 - int64x64 tests trigger valgrind bug - Bug 1883 - IPv6 don't consider the prefix and network when choosing output address diff --git a/src/energy/helper/basic-energy-source-helper.cc b/src/energy/helper/basic-energy-source-helper.cc index 3bae7bf8b..8bc3f294e 100644 --- a/src/energy/helper/basic-energy-source-helper.cc +++ b/src/energy/helper/basic-energy-source-helper.cc @@ -42,13 +42,7 @@ Ptr BasicEnergySourceHelper::DoInstall (Ptr node) const { NS_ASSERT (node != NULL); - // check if energy source already exists - Ptr source = node->GetObject (); - if (source != NULL) - { - NS_FATAL_ERROR ("Energy source already installed!"); - } - source = m_basicEnergySource.Create (); + Ptr source = m_basicEnergySource.Create (); NS_ASSERT (source != NULL); source->SetNode (node); return source; diff --git a/src/energy/helper/energy-model-helper.h b/src/energy/helper/energy-model-helper.h index 8e2e287fb..e2e401c0c 100644 --- a/src/energy/helper/energy-model-helper.h +++ b/src/energy/helper/energy-model-helper.h @@ -38,8 +38,8 @@ namespace ns3 { * \ingroup energy * \brief Creates EnergySource objects. * - * This class creates and installs an energy source onto network nodes. Only a - * single source can exist on a network node. + * This class creates and installs an energy source onto network nodes. + * Multiple sources can exist on a network node. * */ class EnergySourceHelper diff --git a/src/energy/helper/rv-battery-model-helper.cc b/src/energy/helper/rv-battery-model-helper.cc index 70581f062..242d2c470 100644 --- a/src/energy/helper/rv-battery-model-helper.cc +++ b/src/energy/helper/rv-battery-model-helper.cc @@ -42,13 +42,7 @@ Ptr RvBatteryModelHelper::DoInstall (Ptr node) const { NS_ASSERT (node != NULL); - // check if energy source already exists - Ptr source = node->GetObject (); - if (source != NULL) - { - NS_FATAL_ERROR ("Energy source already installed!"); - } - source = m_rvBatteryModel.Create (); + Ptr source = m_rvBatteryModel.Create (); NS_ASSERT (source != NULL); source->SetNode (node); return source;