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
code: @code
message: @msg', array( '@pid' => $object->id, '@dsid' => $datastream->id,