Changeset 7897

Timestamp:

06/17/08 19:55:45 (5 years ago)

Author:

shereef

Message:

ALF can install an Application with the DomMgr?; crashes on AppFac? create; getting warmer

Location:

ossiedev/branches/ssayed/devs/src/system/ossie/framework

Files:

• DomainManager_impl.cpp (modified) (4 diffs)
• FileManager_impl.cpp (modified) (1 diff)

ossiedev/branches/ssayed/devs/src/system/ossie/framework/DomainManager_impl.cpp

@@ -1108 +1108 @@
 //sadComponents.begin();
     std::vector < SADComponentPlacement * >::iterator _iterator = sadComponents->begin ();
-
+    std::cout << "[DomainManager::installApplication] Validating SPDs\n";
     while (_iterator != sadComponents->end ())
     {
@@ -1114 +1114 @@
         ++_iterator;
     }
-
+    std::cout << "[DomainManager::installApplication] Adding new AppFac\n";
     appFact_servants.push_back(new ApplicationFactory_impl (profileFileName, &_applications));
 
@@ -1123 +1123 @@
 
     ossieSupport::sendObjAdded_event(_identifier.c_str(), sadParser->getID(), sadParser->getName(), (CORBA::Object_var) NULL, StandardEvent::APPLICATION_FACTORY);
-
-
-    delete sadParser;
-
+    // FIXME: There is a problem deleting SADParser; causes seg fault
+    // delete sadParser;
   } catch (CF::FileException& ex) {
     std::cout << "[DomainManager::installApplication] While validating the SAD profile: " << ex.msg << "\n";
@@ -1455 +1453 @@
       if ((strstr (_spdProfile, ".spd.xml")) == NULL)
           std::cerr << "File " << _spdProfile << " should end with .spd.xml" << std::endl;
-      
+      std::cout << "[DomainManager::validateSPD] Validating: " << _spdProfile << "\n";
       SPDParser spdParser ( _fileMgr->open( _spdProfile, true ) );
 

ossiedev/branches/ssayed/devs/src/system/ossie/framework/FileManager_impl.cpp

@@ -199 +199 @@
         throw CF::InvalidFileName (CF::CFEINVAL, "[FileManager::exists] Invalid file name");
     }
-    unsigned int fileFS(0);
-    std::string filePath;
-
-    getFSandFSPath(fileName, fileFS, filePath);
-
-    DEBUG(6, FileManager, "Running FS.exists for FS " << mount_table[fileFS].mountPoint << " and path " << filePath)
-    if (mount_table[fileFS].fs->exists (filePath.c_str()))
-        return true;
-    else
-        return false;
+
+    DEBUG(6, FileManager, "Running FS.exists for file " << fileName)
+
+    for( int i = 0; i < numMounts; i++ )
+    {
+     if (mount_table[i].fs->exists (fileName) )
+      return true;
+    }
+    return false;
 }