From f3e9c1716bb04a1ef888f33be4c50a38d158c686 Mon Sep 17 00:00:00 2001
From: Jordan Dukart <jordan@discoverygarden.ca>
Date: Tue, 6 Jun 2017 07:02:09 -0300
Subject: [PATCH] Move the exception for easy removal later.

---
 includes/tuque_wrapper.inc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/includes/tuque_wrapper.inc b/includes/tuque_wrapper.inc
index 810897ee..10905123 100644
--- a/includes/tuque_wrapper.inc
+++ b/includes/tuque_wrapper.inc
@@ -239,15 +239,15 @@ class IslandoraFedoraObject extends FedoraObject {
       islandora_invoke_datastream_hooks(ISLANDORA_DATASTREAM_INGESTED_HOOK, $object->models, $datastream->id, $object, $datastream);
       return $ret;
     }
-    catch (DatastreamExistsException $e) {
-      $message = islandora_deprecated('7.x-1.10', t('The datastream @dsid already exists on the object: @pid. After the 7.x-1.10 release this will throw an exception.', array(
-        '@dsid' => $datastream->id,
-        '@pid' => $object->id,
-      )));
-      trigger_error(filter_xss($message), E_USER_DEPRECATED);
-      return FALSE;
-    }
     catch (Exception $e) {
+      if ($e instanceof DatastreamExistsException) {
+        $message = islandora_deprecated('7.x-1.10', t('The datastream @dsid already exists on the object: @pid. After the 7.x-1.10 release this will throw an exception.', array(
+          '@dsid' => $datastream->id,
+          '@pid' => $object->id,
+        )));
+        trigger_error(filter_xss($message), E_USER_DEPRECATED);
+        return FALSE;
+      }
       watchdog('islandora', 'Failed to ingest datastream @dsid on object: @pid</br>code: @code<br/>message: @msg', array(
         '@pid' => $object->id,
         '@dsid' => $datastream->id,