3 files changed, 101 insertions, 1 deletions
diff --git a/src/vmime/utility/encoder/encoderFactory.cpp b/src/vmime/utility/encoder/encoderFactory.cpp
index 3e0351f3..cda8168d 100644
--- a/src/vmime/utility/encoder/encoderFactory.cpp
+++ b/src/vmime/utility/encoder/encoderFactory.cpp
@@ -71,7 +71,17 @@ shared_ptr <encoderFactory> encoderFactory::getInstance()
 
 shared_ptr <encoder> encoderFactory::create(const string& name)
 {
-	return (getEncoderByName(name)->create());
+	try
+	{
+		return (getEncoderByName(name)->create());
+	}
+	catch (exceptions::no_encoder_available &) {
+
+		if (m_defaultEncoder)
+			return m_defaultEncoder;
+
+		throw;
+	}
 }
 
 
@@ -116,6 +126,18 @@ const std::vector <shared_ptr <const encoderFactory::registeredEncoder> > encode
 }
 
 
+void encoderFactory::setDefaultEncoder(const shared_ptr <encoder>& enc)
+{
+	m_defaultEncoder = enc;
+}
+
+
+shared_ptr <encoder> encoderFactory::getDefaultEncoder() const
+{
+	return m_defaultEncoder;
+}
+
+
 } // encoder
 } // utility
 } // vmime
diff --git a/src/vmime/utility/encoder/encoderFactory.hpp b/src/vmime/utility/encoder/encoderFactory.hpp
index 763cbd5c..91121ad5 100644
--- a/src/vmime/utility/encoder/encoderFactory.hpp
+++ b/src/vmime/utility/encoder/encoderFactory.hpp
@@ -88,6 +88,7 @@ private:
 
 
 	std::vector <shared_ptr <registeredEncoder> > m_encoders;
+	shared_ptr <encoder> m_defaultEncoder;
 
 public:
 
@@ -137,6 +138,20 @@ public:
 	  * @return list of registered encoders
 	  */
 	const std::vector <shared_ptr <const registeredEncoder> > getEncoderList() const;
+
+	/** Set the default encoder to use when no other encoder
+	  * is registered for an encoding (fallback).
+	  *
+	  * @param enc default encoder
+	  */
+	void setDefaultEncoder(const shared_ptr <encoder>& enc);
+
+	/** Return the default encoder to use when no other encoder
+	  * is registered for an encoding (fallback).
+	  *
+	  * @return default encoder
+	  */
+	shared_ptr <encoder> getDefaultEncoder() const;
 };
 
 
diff --git a/tests/utility/encoder/encoderFactoryTest.cpp b/tests/utility/encoder/encoderFactoryTest.cpp
new file mode 100644
index 00000000..ce50dc6a
--- /dev/null
+++ b/tests/utility/encoder/encoderFactoryTest.cpp
@@ -0,0 +1,63 @@
+//
+// VMime library (http://www.vmime.org)
+// Copyright (C) 2002-2013 Vincent Richard <[email protected]>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 3 of
+// the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+
+#include "tests/testUtils.hpp"
+
+#include "vmime/utility/encoder/noopEncoder.hpp"
+
+
+
+VMIME_TEST_SUITE_BEGIN(encoderFactoryTest)
+
+	VMIME_TEST_LIST_BEGIN
+		VMIME_TEST(testNoDefaultEncoder)
+		VMIME_TEST(testDefaultEncoder)
+	VMIME_TEST_LIST_END
+
+
+	void testNoDefaultEncoder()
+	{
+		vmime::shared_ptr <vmime::utility::encoder::encoderFactory> ef =
+			vmime::utility::encoder::encoderFactory::getInstance();
+
+		VASSERT_THROW(
+			"no default encoder",
+			ef->create("non-existing-encoding"),
+			vmime::exceptions::no_encoder_available
+		);
+	}
+
+	void testDefaultEncoder()
+	{
+		vmime::shared_ptr <vmime::utility::encoder::encoderFactory> ef =
+			vmime::utility::encoder::encoderFactory::getInstance();
+
+		ef->setDefaultEncoder(vmime::make_shared <vmime::utility::encoder::noopEncoder>());
+
+		VASSERT_NO_THROW(
+			"default encoder",
+			ef->create("non-existing-encoding")
+		);
+	}
+
+VMIME_TEST_SUITE_END