*** empty log message ***

5 files changed, 42 insertions, 32 deletions

diff --git a/ace/CLASSIX/CLASSIX_OS.cpp b/ace/CLASSIX/CLASSIX_OS.cpp
index c93b7432d77..01a1407e340 100644
--- a/ace/CLASSIX/CLASSIX_OS.cpp
+++ b/ace/CLASSIX/CLASSIX_OS.cpp
@@ -20,7 +20,7 @@
 #include "ace/CLASSIX/CLASSIX_OS.i"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/CLASSIX/CLASSIX_Reactor.h"
+#include "ace/CLASSIX/CLASSIX_Select_Reactor.h"
 
 /* ------------------------------------------------------------------------- */
 
diff --git a/ace/CLASSIX/CLASSIX_Reactor.cpp b/ace/CLASSIX/CLASSIX_Select_Reactor.cpp
index 8f65557e33e..035c6219403 100644
--- a/ace/CLASSIX/CLASSIX_Reactor.cpp
+++ b/ace/CLASSIX/CLASSIX_Select_Reactor.cpp
@@ -13,13 +13,13 @@
 // 
 // ============================================================================
 */
-#include "CLASSIX/Reactor.h"
+#include "ace/CLASSIX/CLASSIX_Select_Reactor.h"
 
 #if !defined (__ACE_INLINE__)
-#include "CLASSIX/Reactor.i"
+#include "ace/CLASSIX/CLASSIX_Select_Reactor.i"
 #endif /* __ACE_INLINE__ */
 
-#include "CLASSIX/OS.h"
+#include "ace/CLASSIX/CLASSIX_OS.h"
 /* ------------------------------------------------------------------------- */
 int
 ACE_CLASSIX_Select_Reactor::wait_for_multiple_events 
@@ -113,7 +113,7 @@ ACE_CLASSIX_Select_Reactor::set_current_info_(ACE_HANDLE thePort,
 }
 
 int 
-ACE_CLASSIX_Select_Reactor::get_current_info(ACE_HANDLE thePort, 
+ACE_CLASSIX_Select_Reactor::current_info(ACE_HANDLE thePort, 
 					     size_t& theSize)
 {
     ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_MUTEX, 
@@ -165,7 +165,7 @@ ACE_CLASSIX_Select_Reactor_Notify::dump (void) const
   ACE_TRACE ("ACE_CLASSIX_Select_Reactor_Notify::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("CLASSIX_select_reactor_ = %x"), 
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_CLASSIX_select_reactor_ = %x"), 
 	      this->select_reactor_));
   this->notification_sap_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
@@ -173,12 +173,13 @@ ACE_CLASSIX_Select_Reactor_Notify::dump (void) const
 
 int
 ACE_CLASSIX_Select_Reactor_Notify::open (ACE_Reactor_Impl *theReactor,
-					 ACE_Timer_Queue* 
+					 ACE_Timer_Queue*,
 					 int the_disable_notify_pipe)
 {
     if (the_disable_notify_pipe == 0)
     {
-	this->select_reactor_ = theReactor;
+	this->select_reactor_ =  ACE_dynamic_cast 
+	    (ACE_CLASSIX_Select_Reactor *, theReactor);
 
 	if (this->notification_sap_.open (&this->notification_port_) != 0 ||
 	    this->notification_sap_.selectable() != 0)
@@ -257,9 +258,9 @@ ACE_CLASSIX_Select_Reactor_Notify::handle_input (ACE_HANDLE handle)
     int                     number_dispatched = 0;
 
     ACE_Notification_Buffer buffer;
-//    ACE_CLASSIX_Msg rmsg(&buffer, sizeof (buffer));
+    ACE_CLASSIX_Msg rmsg(&buffer, sizeof (buffer));
 
-    if (this->select_reactor_->get_current_info(handle, n1) == -1 ||
+    if (this->select_reactor_->current_info(handle, n1) == -1 ||
 	n1 != sizeof buffer)
     {
 	// I'm not quite sure what to do at this point.  It's
@@ -270,8 +271,7 @@ ACE_CLASSIX_Select_Reactor_Notify::handle_input (ACE_HANDLE handle)
 	return -1;
     }
 
-//    while ((n = ::ipcGetData(rmsg.get())) > 0)
-    while ((n = ::ipcGetData(&buffer)) > 0)
+    while ((n = ::ipcGetData(rmsg.get())) > 0)
     {
 	if (n != sizeof buffer)
         {
diff --git a/ace/CLASSIX/CLASSIX_Reactor.h b/ace/CLASSIX/CLASSIX_Select_Reactor.h
index ea9eaca3e95..b525c3a9950 100644
--- a/ace/CLASSIX/CLASSIX_Reactor.h
+++ b/ace/CLASSIX/CLASSIX_Select_Reactor.h
@@ -25,6 +25,7 @@
 #include "ace/Message_Block.h"
 #include "ace/CLASSIX/CLASSIX_SAP.h"
 
+class ACE_CLASSIX_Select_Reactor;
 
 class ACE_Export ACE_CLASSIX_Select_Reactor_Notify : 
     public ACE_Reactor_Notify
@@ -40,6 +41,8 @@ class ACE_Export ACE_CLASSIX_Select_Reactor_Notify :
 public:
     // = Initialization and termination methods.
     ACE_CLASSIX_Select_Reactor_Notify(void);
+    ~ACE_CLASSIX_Select_Reactor_Notify(void);
+
     virtual int open (ACE_Reactor_Impl *,
 		      ACE_Timer_Queue * = 0,
 		      int  = 0 /* dusable_notify_pip */);
@@ -85,7 +88,7 @@ public:
     // Declare the dynamic allocation hooks.
 
 private:
-    ACE_Select_Reactor *select_reactor_;
+    ACE_CLASSIX_Select_Reactor       *select_reactor_;
     // Keep a back pointer to the <ACE_Select_Reactor>.  If this value
     // if NULL then the <ACE_Select_Reactor> has been initialized with
     // <disable_notify_pipe>.
@@ -135,8 +138,8 @@ class ACE_CLASSIX_Select_Reactor : public ACE_Select_Reactor
     // The following message should be called in the handler's
     // handle_input() routine.
     // The handle_input() routine should not hold the reactor for too long.
-    virtual int get_current_info(ACE_HANDLE /* port */,
-				 size_t& /* msg size */);
+    virtual int current_info(ACE_HANDLE /* port */,
+			     size_t& /* msg size */);
     // Retruns the current messageage to the caleer if the supplied
     // handle id is the same as the <current_handle_>
     // Returns 0, if <msg size> constains the size of the message
@@ -193,7 +196,7 @@ class ACE_CLASSIX_Select_Reactor : public ACE_Select_Reactor
 /* ------------------------------------------------------------------------- */
 
 #if defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_Reactor.i"
+#include "ace/CLASSIX/CLASSIX_Select_Reactor.i"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_CLASSIX_REACTOR_H */
diff --git a/ace/CLASSIX/CLASSIX_Reactor.i b/ace/CLASSIX/CLASSIX_Select_Reactor.i
index 002fc94af1e..af4e995cb87 100644
--- a/ace/CLASSIX/CLASSIX_Reactor.i
+++ b/ace/CLASSIX/CLASSIX_Select_Reactor.i
@@ -12,6 +12,11 @@ ACE_CLASSIX_Select_Reactor_Notify::ACE_CLASSIX_Select_Reactor_Notify(void)
 }
 
 ACE_INLINE
+ACE_CLASSIX_Select_Reactor_Notify::~ACE_CLASSIX_Select_Reactor_Notify(void)
+{
+}
+
+ACE_INLINE
 ACE_CLASSIX_Select_Reactor::ACE_CLASSIX_Select_Reactor(
     ACE_Timer_Queue *theTimeQ)
   : ACE_Select_Reactor(0, theTimeQ, 0,
@@ -43,12 +48,13 @@ ACE_CLASSIX_Select_Reactor_Notify::close (void)
 
 ACE_INLINE
 void
-ACE_Select_Reactor::max_notify_iterations (int iterations)
+ACE_CLASSIX_Select_Reactor_Notify::max_notify_iterations (int iterations)
 {
 }
 
+ACE_INLINE
 int
-ACE_Select_Reactor::max_notify_iterations (void)
+ACE_CLASSIX_Select_Reactor_Notify::max_notify_iterations (void)
 {
     return 1;
 }
diff --git a/ace/CLASSIX/Makefile b/ace/CLASSIX/Makefile
index e58e41601f2..1af4d1d45c7 100644
--- a/ace/CLASSIX/Makefile
+++ b/ace/CLASSIX/Makefile
@@ -8,20 +8,21 @@ MAKEFILE = Makefile
 LIB      = libCLASSIX.a
 
 FILES    = \
-        CLASSIX_OS            \
-        CLASSIX_Addr          \
-        CLASSIX_Port_Core     \
-        CLASSIX_Port          \
-        CLASSIX_Port_Default  \
-        CLASSIX_Group         \
-        CLASSIX_Group_Stamp   \
-        CLASSIX_Group_Dynamic \
-        CLASSIX_SAP           \
-        CLASSIX_Peer_SAP      \
-        CLASSIX_Stream        \
-        CLASSIX_Dgram_Mcast   \
-        CLASSIX_CO_Acceptor   \
-        CLASSIX_CO_Connector  \
+        CLASSIX_OS            	\
+        CLASSIX_Select_Reactor	\
+        CLASSIX_Addr          	\
+        CLASSIX_Port_Core     	\
+        CLASSIX_Port          	\
+        CLASSIX_Port_Default  	\
+        CLASSIX_Group         	\
+        CLASSIX_Group_Stamp   	\
+        CLASSIX_Group_Dynamic 	\
+        CLASSIX_SAP           	\
+        CLASSIX_Peer_SAP      	\
+        CLASSIX_Stream        	\
+        CLASSIX_Dgram_Mcast   	\
+        CLASSIX_CO_Acceptor   	\
+        CLASSIX_CO_Connector  	\
         CLASSIX_CLD_Connector