Changeset 13826 for trunk/core/lib/Foswiki.pm

Timestamp:

01/26/12 02:45:28 (4 months ago)

Author:

PaulHarvey

Message:

Item11431: add ASSERTs for SINGLE_SINGLETONS

File:

• trunk/core/lib/Foswiki.pm (modified) (6 diffs)

trunk/core/lib/Foswiki.pm

@@ -85 +85 @@
 # corrupting data spaces.
 our $inUnitTestMode = 0;
+
+sub SINGLE_SINGLETONS       { 0 }
+sub SINGLE_SINGLETONS_TRACE { 0 }
 
 # Returns the full path of the directory containing Foswiki.pm
@@ -1665 +1668 @@
     my $this = bless( { sandbox => 'Foswiki::Sandbox' }, $class );
 
+    if (SINGLE_SINGLETONS_TRACE) {
+        require Data::Dumper;
+        print STDERR "new $this: "
+          . Data::Dumper->Dump( [ [caller], [ caller(1) ] ] );
+    }
+
     # Tell Foswiki::Response which charset we are using if not default
     $Foswiki::cfg{Site}{CharSet} ||= 'iso-8859-1';
@@ -1675 +1684 @@
     # This is required in case we get an exception during
     # initialisation, so that we have a session to handle it with.
+    ASSERT( !$Foswiki::Plugins::SESSION ) if SINGLE_SINGLETONS;
     $Foswiki::Plugins::SESSION = $this;
+    ASSERT( $Foswiki::Plugins::SESSION->isa('Foswiki') ) if DEBUG;
 
     # hash of zone records
@@ -2132 +2143 @@
 
     undef $this->{DebugVerificationCode};    # from Foswiki::UI::Register
+    if (SINGLE_SINGLETONS_TRACE) {
+        require Data::Dumper;
+        print STDERR "finish $this: "
+          . Data::Dumper->Dump( [ [caller], [ caller(1) ] ] );
+    }
+    if (SINGLE_SINGLETONS) {
+        ASSERT( defined $Foswiki::Plugins::SESSION );
+        ASSERT( $Foswiki::Plugins::SESSION == $this );
+        ASSERT( $Foswiki::Plugins::SESSION->isa('Foswiki') );
+    }
+    undef $Foswiki::Plugins::SESSION;
 
     if (DEBUG) {
@@ -2400 +2422 @@
 
     # Make sure func works, for registered tag handlers
+    if (SINGLE_SINGLETONS) {
+        ASSERT( defined $Foswiki::Plugins::SESSION );
+        ASSERT( $Foswiki::Plugins::SESSION == $this );
+    }
     local $Foswiki::Plugins::SESSION = $this;
+    ASSERT( $Foswiki::Plugins::SESSION->isa('Foswiki') ) if DEBUG;
 
     my $text = $topicObject->text();
@@ -2729 +2756 @@
 
     # Make sure func works, for registered tag handlers
-    $Foswiki::Plugins::SESSION = $this;
+    if (SINGLE_SINGLETONS) {
+        ASSERT( defined $Foswiki::Plugins::SESSION );
+        ASSERT( $Foswiki::Plugins::SESSION == $this );
+    }
+    local $Foswiki::Plugins::SESSION = $this;
+    ASSERT( $Foswiki::Plugins::SESSION->isa('Foswiki') ) if DEBUG;
 
     # NOTE TO DEBUGGERS