ChangeLogTag:Fri Aug 29 10:55:35 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

3 files changed, 24 insertions, 9 deletions

diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index 71d42fb09b7..0aeeb19d1dd 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,10 @@
+Fri Aug 29 10:55:35 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* tao/Collocated_Invocation.cpp (TAO): 
+	* tao/Invocation_Base.h: Fixed compilation errors when built with
+	  interceptors == 0. The problems were basically wrong scoping of
+	  the TAO_HAS_INTERCEPTORS == 1 flag.
+
 Thu Aug 28 19:38:38 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* tao/ClientRequestInfo_i.cpp:
diff --git a/TAO/tao/Collocated_Invocation.cpp b/TAO/tao/Collocated_Invocation.cpp
index 2105ebe48ac..287d76c55c8 100644
--- a/TAO/tao/Collocated_Invocation.cpp
+++ b/TAO/tao/Collocated_Invocation.cpp
@@ -25,6 +25,8 @@ namespace TAO
                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::Exception))
   {
+
+    /// Start the interception point
 #if TAO_HAS_INTERCEPTORS == 1
 
     Invocation_Status s =
@@ -49,7 +51,7 @@ namespace TAO
 
 #if TAO_HAS_INTERCEPTORS == 1
         if (this->forwarded_to_.in () ||
-            this->response_expected () == false)
+            this->response_expected_ == false)
           {
             s =
               this->receive_other_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -66,8 +68,10 @@ namespace TAO
       }
     ACE_CATCHANY
       {
-        if (this->response_expected () == false)
+        // Ignore exceptions for oneways
+        if (this->response_expected_ == false)
           return TAO_INVOKE_SUCCESS;
+
 #if TAO_HAS_INTERCEPTORS == 1
         PortableInterceptor::ReplyStatus status =
           this->handle_any_exception (&ACE_ANY_EXCEPTION
@@ -110,4 +114,5 @@ namespace TAO
 
     return TAO_INVOKE_SUCCESS;
   }
+
 }
diff --git a/TAO/tao/Invocation_Base.h b/TAO/tao/Invocation_Base.h
index e5c7fb7d990..cdef91c23b4 100644
--- a/TAO/tao/Invocation_Base.h
+++ b/TAO/tao/Invocation_Base.h
@@ -102,11 +102,11 @@ namespace TAO
     /// Return the target object
     CORBA::Object_ptr target (void) const;
 
-    /// Does this invocation return a rsponse?
+    /// Does this invocation return a response?
     CORBA::Boolean  response_expected (void) const;
+
     //@}
   protected:
-
     /// Don't allow creation of an object of type Invocation_Base.
     /**
      * @param otarget, The original target on which this invocation
@@ -132,6 +132,9 @@ namespace TAO
     /// Forwarded object reference.
     CORBA::Object_var forwarded_to_;
 
+    /// Is the response expected?
+    bool response_expected_;
+
   private:
 
     ACE_UNIMPLEMENTED_FUNC (Invocation_Base & operator= (const Invocation_Base &));
@@ -149,14 +152,15 @@ namespace TAO
 
     /// The effective target on which the invocation is on.
     CORBA::Object_ptr target_;
+
     //@}
-#if TAO_HAS_INTERCEPTORS == 1
-  public:
+
     /// Operations invoked by the
     /// PortableInterceptor::ClientRequestInfo object to get details
     /// about the operation and related stuff.
     //@{
-
+#if TAO_HAS_INTERCEPTORS == 1
+  public:
     /// Return the name of the operation.
     char *operation_name (void);
 
@@ -206,8 +210,7 @@ namespace TAO
     ClientRequestInterceptor_Adapter adapter_;
     TAO_ClientRequestInfo_i req_info_;
 
-    /// Is the response expected?
-    bool response_expected_;
+
 #endif /*TAO_HAS_INTERCEPTORS*/
   };
 }