From 1dd9844a220b4d7ab9e342658b9f6711f1d6a8a9 Mon Sep 17 00:00:00 2001
From: Chris <chris@starforge.co.uk>
Date: Wed, 15 Aug 2012 14:21:46 +0100
Subject: [PATCH] Allow deferred setting of the module loader object.

---
 Message.pm | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/Message.pm b/Message.pm
index 204dbbe..b31b717 100644
--- a/Message.pm
+++ b/Message.pm
@@ -40,12 +40,32 @@ sub new {
     my $self = $class -> SUPER::new(@_)
         or return undef;
 
-    return SystemModule::set_error("No module object available.")   if(!$self -> {"module"});
-
     return $self;
 }
 
 
+## @method void DESTROY()
+# Destructor method to prevent a circular list formed from a reference to the modules
+# object from derailing normal destruction.
+sub DESTROY {
+    my $self = shift;
+
+    $self -> {"module"} = undef;
+}
+
+
+## @method void set_module_obj($module)
+# Set the reference to the system module loader. This allows deferred initialisation
+# of the module loader.
+#
+# @param module A reference to the system module handler object.
+sub set_module_obj {
+    my $self = shift;
+
+    $self -> {"module"} = shift;
+}
+
+
 # ============================================================================
 #  Transport handling
 
@@ -81,6 +101,9 @@ sub load_transport_module {
     my $self = shift;
     my $args = hash_or_hashref(@_);
 
+    return $self -> self_error("Module loader not available at this time")
+        unless($self -> {"module"});
+
     # Work out which field is being searched on
     my $field;
     if($args -> {"id"}) {