Changeset 7833

Timestamp:

06/11/08 03:44:14 (5 years ago)

Author:

shereef

Message:

DomainManager? crashes while calling FileMgr?->list; getting there

Location:

ossiedev/branches/ssayed/devs/src/system

Files:

• nodebooter/nodebooter.cpp (modified) (2 diffs)
• ossie/framework/DomainManager_impl.cpp (modified) (2 diffs)
• ossie/framework/FileManager_impl.cpp (modified) (1 diff)
• ossie/framework/FileSystem_impl.cpp (modified) (1 diff)

ossiedev/branches/ssayed/devs/src/system/nodebooter/nodebooter.cpp

@@ -97 +97 @@
                 dmdFile = new string(optarg);
             else
-                dmdFile = new string("domain/DomainManager.dmd.xml");
+                dmdFile = new string("/DomainManager.dmd.xml");
 
             break;
@@ -148 +148 @@
         // Create Domain Manager servant and object
        
-        DomainManager_servant = new DomainManager_impl(dmdFile->c_str(), "/sdr");
+        DomainManager_servant = new DomainManager_impl(dmdFile->c_str(), "/sdr/domain");
         DomainManager_objref = DomainManager_servant->_this();
 

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

@@ -62 +62 @@
     _fileSys = _fileSysImpl->_this();
 // Mount the file system to the file manager
-    _fileMgr->mount("/", _fileSys);
+    try
+    {
+     _fileMgr->mount("/", _fileSys);
+    } catch( CF::InvalidFileName &_ex ) {
+     std::cout << "[DomainManager::ctor] While mounting File System: " << _ex.msg << "\n";
+     exit(EXIT_FAILURE);
+    } /*catch( CF::InvalidFileSystem &_ex ) {
+     std::cout << "[DomainManager::ctor] While mounting File System: Invalid File System\n";
+     exit(EXIT_FAILURE);
+    } catch( CF::MointPointAlreadyExists &_ex ) {
+     std::cout << "[DomainManager::ctor] While mounting File System: Moint point already exists\n";
+     exit(EXIT_FAILURE);
+    }*/ catch( ... ) { exit(EXIT_FAILURE); }
 // Parse the DMD profile
-    CF::File_var _dmd = _fileMgr->open( _domainManagerProfile.c_str(), true );
+    CF::File_var _dmd;
+    try
+    {
+     _dmd = _fileMgr->open( _domainManagerProfile.c_str(), true );
+    } catch( CF::InvalidFileName &_ex ) {
+     std::cout << "[DomainManager::ctor] While opening DMD: " << _ex.msg << "\n";
+     exit(EXIT_FAILURE);
+    } catch( CF::FileException &_ex ) {
+     std::cout << "[DomainManager::ctor] While opening DMD: " << _ex.msg << "\n";
+     exit(EXIT_FAILURE);
+    } catch( ... ) { exit(EXIT_FAILURE); }
+
     DMDParser _DMDParser ( _dmd  );
     _dmd->close();
@@ -73 +96 @@
 
 /// \todo Discuss using filename + path directly from xml and screwing with FileSystem
-    CF::FileSystem::FileInformationSequence_var _dmdSoftPkg
-        = _fileMgr->list (_DMDParser.getDomainManagerSoftPkg ());
-    CF::File_var _spd = _fileMgr->open( _DMDParser.getDomainManagerSoftPkg(), true );
+    CF::FileSystem::FileInformationSequence_var _dmdSoftPkg;
+    try
+    {
+     _dmdSoftPkg = _fileMgr->list (_DMDParser.getDomainManagerSoftPkg ());
+    } catch( CF::InvalidFileName &_ex ) {
+     std::cout << "[DomainManager::ctor] While obtaining File Information Sequence: " << _ex.msg << "\n";
+     exit(EXIT_FAILURE);
+    } catch( CF::FileException &_ex ) {
+     std::cout << "[DomainManager::ctor] While obtaining File Information Sequence: " << _ex.msg << "\n";
+     exit(EXIT_FAILURE);
+    } catch( ... ) { exit(EXIT_FAILURE); }
+
+    CF::File_var _spd;
+    try
+    {
+     _spd = _fileMgr->open( _DMDParser.getDomainManagerSoftPkg(), true );
+    } catch( CF::InvalidFileName &_ex ) {
+     std::cout << "[DomainManager::ctor] While opening SPD: " << _ex.msg << "\n";
+     exit(EXIT_FAILURE);
+    } catch( CF::FileException &_ex ) {
+     std::cout << "[DomainManager::ctor] While opening SPD: " << _ex.msg << "\n";
+     exit(EXIT_FAILURE);
+    }
     SPDParser _DM_SPD_Parser ( _spd );
     _spd->close();

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

@@ -220 +220 @@
 
     if (pattern[0] != '/')
-            throw CF::InvalidFileName(CF::CFEINVAL, "Relative path passed to FileManger::list.");
+            throw CF::InvalidFileName(CF::CFEINVAL, "[FileManager::list] Relative path given.");
 
     try {

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

@@ -251 +251 @@
     if (!exists(fileName)) {
         DEBUG(6, FileSystem, "FileName does not exist in open, throwing exception.");
-        throw CF::FileException(CF::CFEEXIST, "File does not exist.");
+        throw CF::FileException(CF::CFEEXIST, "[FileSystem::open] File does not exist.");
     }