File: Kein deep clone von Strukturen machen die SL::DB::* Objekte enthalten

Das führt zu Duplizierungen von Singletons, in diesem Fall der
Datenbankverbindung die dann beim abbauen kaputtgehen.

(cherry picked from commit 9a86234c1a5624573a3f2738cf25b526527796c8)

Behebt #358 (redmine).

diff --git a/SL/File.pm b/SL/File.pm
index 830559460898609c55e3e583686f52ccfafff744..25c6d96c1505161083ca14fda253d879f31172d6 100644 (file)
--- a/SL/File.pm
+++ b/SL/File.pm
@@ -4,7 +4,6 @@ use strict;
 
 use parent qw(Rose::Object);
 
-use Clone qw(clone);
 use SL::File::Backend;
 use SL::File::Object;
 use SL::DB::History;
@@ -78,7 +77,7 @@ sub get_all_versions {
       for my $version (2..$maxversion) {
         $main::lxdebug->message(LXDebug->DEBUG2(), "clone for version=".($maxversion-$version+1));
         eval {
-          my $clone = clone($fileobj);
+          my $clone = $fileobj->clone;
           $clone->version($maxversion-$version+1);
           $clone->newest(0);
           $main::lxdebug->message(LXDebug->DEBUG2(), "clone version=".$clone->version." mtime=". $clone->mtime);

diff --git a/SL/File/Object.pm b/SL/File/Object.pm
index 7ac8706fce69757752fb1e45de176773f3bb91f4..3aa553d23580cdfbf2edaeead7454a6c92c93ab1 100644 (file)
--- a/SL/File/Object.pm
+++ b/SL/File/Object.pm
@@ -124,6 +124,10 @@ sub loaded_db_file {  # so, dass wir die nur einmal laden.
   $_[0]->db_file;
 }
 
+sub clone {
+  bless +{ %{ $_[0] } }, __PACKAGE__;
+}
+
 
 sub init_db_file { die 'must always have a db file'; }
 sub init_loaded  { 0 }