Catch the exception here so we at least finish the WBXML output.

horde · Feb 18, 2016 · 754d1ad · 754d1ad
1 parent d5d7151
commit 754d1ad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php b/framework/ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php
@@ -370,7 +370,11 @@ public function messageChange($id, Horde_ActiveSync_Message_Base $message)
         $this->_encoder->content($id);
         $this->_encoder->endTag();
         $this->_encoder->startTag(Horde_ActiveSync::SYNC_DATA);
-        $message->encodeStream($this->_encoder);
+        try {
+            $message->encodeStream($this->_encoder);
+        } catch (Horde_ActiveSync_Exception $e) {
+            $this->_logger->err($e);
+        }
         $this->_encoder->endTag();
         $this->_encoder->endTag();
     }

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Message/Base.php b/framework/ActiveSync/lib/Horde/ActiveSync/Message/Base.php
@@ -477,6 +477,7 @@ public function decodeStream(Horde_ActiveSync_Wbxml_Decoder &$decoder)
      * Output is ordered according to $_mapping
      *
      * @param Horde_ActiveSync_Wbxml_Encoder $encoder  The wbxml stream encoder
+     * @throws  Horde_ActiveSync_Exception
      */
     public function encodeStream(Horde_ActiveSync_Wbxml_Encoder &$encoder)
     {