Changeset 3368

Timestamp:

04/08/07 17:59:45 (6 years ago)

Author:

balister

Message:

Fix a few smaller problems.

Location:

ossie/trunk/ossie/framework

Files:

• DomainManager_impl.cpp (modified) (7 diffs)
• helperFunctions.cpp (modified) (1 diff)

ossie/trunk/ossie/framework/DomainManager_impl.cpp

@@ -322 +322 @@
 //its File Manager.
 //Unmount filesystem from "/DomainName1/<deviceMgr.label>"
+#if 0 ///\todo Fix this code so it figures out what file systems where really mounted
     std::string mountPoint = "/";
     mountPoint += _identifier;
@@ -328 +329 @@
 
     _fileMgr->unmount (mountPoint.c_str());
+#endif
 
 //The unregisterDeviceManager operation shall unregister a DeviceManager component from the
@@ -392 +394 @@
     DEBUG(6, DomainManager, "Entering removeDeviceMgrServices.");
 
+    return; ///\todo Deal with services
 //The unregisterDeviceManager operation shall release all service(s) associated with
 //the DeviceManager that is being unregistered.
@@ -1023 +1026 @@
     DEBUG(1, DomMgr, "Entering installApplication with " << profileFileName);
 
-    try {
         if ((strstr (profileFileName, ".sad.xml")) == NULL)
             std::cerr << "File " << profileFileName << " should end with .sad.xml." << std::endl;
@@ -1029 +1031 @@
         DEBUG(8, DomainManager, "About to parse SAD file.");
 
-        CF::File_var file = _fileMgr->open(profileFileName, true);
+        CF::File_var file;
+        try {
+            file = _fileMgr->open(profileFileName, true);
+        } catch (CF::FileException ex) {
+            throw CF::InvalidFileName (CF::CFEINVAL, "File not found.");
+        }
+
         SADParser *sadParser = new SADParser (file);
         file->close();
@@ -1038 +1046 @@
     for (unsigned int i = 0; i < appFact_servants.size(); i++)
     {
-      if (!strcmp(sadParser->getID (), appFact_servants[i]->identifier()))
+      if (strcmp(sadParser->getID (), appFact_servants[i]->identifier()) == 0)
         {
+            DEBUG(1, DomainManager, "Application already installed.");
             delete sadParser;
-            return;
+            throw CF::DomainManager::ApplicationInstallationError(CF::CFEEXIST, "Application already installed.");
         }
     }
@@ -1072 +1081 @@
 
     ossieSupport::sendObjAdded_event(_identifier.c_str(), sadParser->getID(), sadParser->getName(), (CORBA::Object_var) NULL, StandardEvent::APPLICATION_FACTORY);
-
-
-  } catch (CF::FileException ex) {
-    throw CF::DomainManager::ApplicationInstallationError (CF::CFEBADF, ex.msg);
-  }
 
     DEBUG(1, DomMgr, "Leaving installApplication")

ossie/trunk/ossie/framework/helperFunctions.cpp

@@ -29 +29 @@
 void ossieSupport::createProfileFromFileName(std::string fileName, std::string &profile)
 {
-    profile = "<profile filename=\"/" + fileName + "\" />";
+    profile = "<profile filename=\"" + fileName + "\" />";
 
     return;