Sun Jun 13 17:55:01 2004 Jaiganesh B <jai@dre.vanderbilt.edu>

2 files changed, 25 insertions, 8 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 75be0a75dcb..28f638c3c8a 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,10 @@
+Sun Jun 13 17:55:01 2004  Jaiganesh B  <jai@dre.vanderbilt.edu>
+
+        * DnC/RepositoryManager/Repository_Manager.cpp:
+
+          Made changes to check if we have a wrong URL to
+          start parsing the deployment plan.
+
 Sat Jun 12 23:17:08 2004  Tao Lu  <lu@dre.vanderbilt.edu>
 
         *  DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
@@ -11,20 +18,20 @@ Sat Jun 12 23:17:08 2004  Tao Lu  <lu@dre.vanderbilt.edu>
         *  DnC/RepositoryManager/Repository_Manager.cpp:
         *  DnC/ciao/NodeApp_CB_Impl.cpp:
         *  DnC/ciao/NodeApp_CB_Impl.h:
-        
-           Debugged on Windows with Visual Studio + Purify. Now 
+
+           Debugged on Windows with Visual Studio + Purify. Now
            Every thing should be fine and people could start to
            do their own code revision.
-           
-           @@Note: If you want to make any change other than 
+
+           @@Note: If you want to make any change other than
            syntactic Changes please be careful and make sure you
            don't break anything.
-           
+
            Now I am moving to add support for Properties.
            Things we need for the Demo.
            1. ComponentIOR registration.
            2. Component Attribute initialization.
-           
+
 Sat Jun 12 16:51:11 2004  Jaiganesh B  <jai@dre.vanderbilt.edu>
 
         * DnC/Config_Handlers/Property_Handler.cpp:
diff --git a/TAO/CIAO/DnC/RepositoryManager/Repository_Manager.cpp b/TAO/CIAO/DnC/RepositoryManager/Repository_Manager.cpp
index 23392c2a5ee..545a9d39539 100644
--- a/TAO/CIAO/DnC/RepositoryManager/Repository_Manager.cpp
+++ b/TAO/CIAO/DnC/RepositoryManager/Repository_Manager.cpp
@@ -7,6 +7,9 @@
 
 const char * exec_ior = "file://exec_mgr.ior";
 
+class Null_Dom_Document { };
+// exception thrown when we have a null dom document.
+
 static void
 usage (const ACE_TCHAR* program)
 {
@@ -66,6 +69,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       DOMBuilder* parser = CIAO::Config_Handler::Utils::
                            create_parser ();
       DOMDocument* dup_doc = parser->parseURI (plan_url);
+
+      if (dup_doc == NULL)
+        {
+          ACE_DEBUG ((LM_DEBUG, "Null DOM Document obtained, \
+                      May be the URL is wrong!!\n"));
+          throw Null_Dom_Document ();
+        }
       auto_ptr<DOMBuilder> cleanup_parser (parser);
       CIAO::Config_Handler::Plan_Handler plan_handler (dup_doc,
                                                   DOMNodeFilter::SHOW_ELEMENT |
@@ -157,13 +167,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     {
       ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: ");
 	while (true);
-      return 1;
+      return -1;
     }
   catch (...)
     {
       ACE_ERROR ((LM_ERROR, "Caught unknown exception\n"));
 	while (true);
-      return 1;
+      return -1;
     }
 
   return 0;