# HG changeset patch
# Parent a17fba5b1a94b81493d03fce6d29cb05b8c7b5a0
# User Tomasz Seweryn <tomasz.seweryn7@gmail.com>
# Date 1398536885 -7200

Bug 1873 - Energy source checked to be aggregated to the node instead of energy source container

diff --git a/src/energy/helper/basic-energy-source-helper.cc b/src/energy/helper/basic-energy-source-helper.cc
--- a/src/energy/helper/basic-energy-source-helper.cc
+++ b/src/energy/helper/basic-energy-source-helper.cc
@@ -42,13 +42,7 @@
 BasicEnergySourceHelper::DoInstall (Ptr<Node> node) const
 {
   NS_ASSERT (node != NULL);
-  // check if energy source already exists
-  Ptr<EnergySource> source = node->GetObject<EnergySource> ();
-  if (source != NULL)
-    {
-      NS_FATAL_ERROR ("Energy source already installed!");
-    }
-  source = m_basicEnergySource.Create<EnergySource> ();
+  Ptr<EnergySource> source = m_basicEnergySource.Create<EnergySource> ();
   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
--- a/src/energy/helper/energy-model-helper.h
+++ b/src/energy/helper/energy-model-helper.h
@@ -38,8 +38,8 @@
  * \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
--- a/src/energy/helper/rv-battery-model-helper.cc
+++ b/src/energy/helper/rv-battery-model-helper.cc
@@ -42,13 +42,7 @@
 RvBatteryModelHelper::DoInstall (Ptr<Node> node) const
 {
   NS_ASSERT (node != NULL);
-  // check if energy source already exists
-  Ptr<EnergySource> source = node->GetObject<EnergySource> ();
-  if (source != NULL)
-    {
-      NS_FATAL_ERROR ("Energy source already installed!");
-    }
-  source = m_rvBatteryModel.Create<EnergySource> ();
+  Ptr<EnergySource> source = m_rvBatteryModel.Create<EnergySource> ();
   NS_ASSERT (source != NULL);
   source->SetNode (node);
   return source;