Changeset 370:0f88a48293bd in SMSSender

Timestamp:

Apr 14, 2014 11:35:44 AM (5 years ago)

Author:

Sämy Zehnder <saemy.zehnder@…>

Branch:

separation-frontend-backend

Message:

• We now distinguish between errors that occur while loading a library (invalid format, wrong version, ...) and errors that are thrown while initializing it.

Files:

• common/exceptions/elibraryloadexception.cpp (modified) (1 diff)
• common/exceptions/elibraryloadexception.h (modified) (1 diff)
• frontend/business/libraryloader_base.cpp (modified) (3 diffs)

common/exceptions/elibraryloadexception.cpp

@@ -61 +61 @@
         case Other:
             return msg + EException::toString();
+        case Initialization:
+            return msg + QObject::tr("Internal error while initializing the library");
         case Unknown:
         default:

common/exceptions/elibraryloadexception.h

@@ -32 +32 @@
         VersionMismatch,
         Other,
+        Initialization,
         Unknown
     };

frontend/business/libraryloader_base.cpp

@@ -50 +50 @@
 #endif
             loadLibrary(libraryPath.absoluteFilePath(filename));
-        } catch (EException& e) {
-            qWarning() << "Erroneous library [" << libraryPath <<"]:" << e.chainedWhat();
+        } catch (Library::ELoadException &e) {
+            qWarning() << e.chainedWhat();
         }
     }
@@ -92 +92 @@
                     QScopedPointer<IIntegrationHelper::Factory> integrationHelperFactory(
                                 createIntegrationHelperFactory(lib->identificationKey()));
-                    lib->init(*integrationHelperFactory);
+                    try {
+                        lib->init(*integrationHelperFactory);
+                    } catch (EException &e){
+                        Library::ELoadException(Library::ELoadException::Initialization)
+                                .chain(e)
+                                .raise();
+                    } catch (...){
+                        Library::ELoadException(Library::ELoadException::Initialization)
+                                .raise();
+                    }
                 }
 
@@ -115 +124 @@
         }
     } catch (Library::ELoadException& e) {
-        qWarning() << "Error while loading library: " << e.toString();
         e.addDebugInfo("filename", filename)
-                .raise();
-    } catch (EException& e) {
-        Library::ELoadException(Library::ELoadException::Unknown)
-                .addDebugInfo("filename", filename)
-                .chain(e)
                 .raise();
     } catch (...) {