From 5eb60264e3ddb3dbe9bbac1dd7a8cf6d2bd78cc4 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Wed, 11 Dec 2019 09:39:30 +0100
Subject: [PATCH] Bug 24213: Fix Koha::Object->get_from_storage if the object
 has been deleted

Without this patch it fails with something like:
  DBIC result _type  isn't of the _type Subscription at t/db_dependent/Biblio.t line 627.

Test plan:
- Apply the first patch (Add tests)
- Confirm that they fail
- Apply this patch
- Confirm that the tests pass

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
(cherry picked from commit a27c5c9dcd5f5f8cbe9af7b9b5ae0f73ac81b2cb)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit f79f4dc5b1c78db56d43e097d5188aef49a75fe7)

Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz>
---
 Koha/Object.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Koha/Object.pm b/Koha/Object.pm
index 1c382f26d3..8cb7d6a3d8 100644
--- a/Koha/Object.pm
+++ b/Koha/Object.pm
@@ -263,6 +263,7 @@ sub unblessed {
 sub get_from_storage {
     my ( $self, $attrs ) = @_;
     my $stored_object = $self->_result->get_from_storage($attrs);
+    return unless $stored_object;
     my $object_class  = Koha::Object::_get_object_class( $self->_result->result_class );
     return $object_class->_new_from_dbic($stored_object);
 }
-- 
2.39.5