Debugging....

5 files changed, 24 insertions, 4 deletions

diff --git a/apps/JAWS/PROTOTYPE/JAWS/IO_Acceptor.cpp b/apps/JAWS/PROTOTYPE/JAWS/IO_Acceptor.cpp
index 54de0d84147..731d9ccd1ab 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/IO_Acceptor.cpp
+++ b/apps/JAWS/PROTOTYPE/JAWS/IO_Acceptor.cpp
@@ -32,7 +32,7 @@ JAWS_IO_Acceptor::accept (size_t)
 int
 JAWS_IO_Synch_Acceptor::open (const ACE_INET_Addr &local_sap)
 {
-  return this->acceptor_->open (local_sap, 0, PF_INET, 5, 0);
+  return this->acceptor_->open (local_sap);
 }
 
 int
diff --git a/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.cpp b/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.cpp
index 8dfca3ca02b..95199b6cea2 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.cpp
+++ b/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.cpp
@@ -107,6 +107,18 @@ JAWS_Synch_IO_Handler::handle (void)
 }
 
 void
+JAWS_Synch_IO_Handler::task (JAWS_Pipeline_Handler *ph)
+{
+  this->task_ = ph;
+}
+
+JAWS_Pipeline_Handler *
+JAWS_Synch_IO_Handler::task (void)
+{
+  return this->task_;
+}
+
+void
 JAWS_Synch_IO_Handler::done (void)
 {
   this->factory ()->destroy_io_handler (this);
diff --git a/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.h b/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.h
index 6b22e88609a..687b275ab20 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.h
@@ -106,6 +106,9 @@ public:
   virtual ACE_HANDLE handle (void) = 0;
   // Returns the socket handle for this handler
 
+  virtual void task (JAWS_Pipeline_Handler *ph) = 0;
+  virtual JAWS_Pipeline_Handler *task (void) = 0;
+
   virtual int status (void) = 0;
 
   enum { IDLE = 0,
@@ -157,12 +160,14 @@ protected:
   virtual void write_error (void);
   virtual void confirmation_message_complete (void);
   virtual void error_message_complete (void);
+  virtual void task (JAWS_Pipeline_Handler *ph);
 
   virtual JAWS_IO_Handler_Factory *factory (void);
   virtual ACE_HANDLE handle (void);
 
   virtual void done (void);
   virtual int status (void);
+  virtual JAWS_Pipeline_Handler *task (void);
 
 private:
   int status_;
@@ -220,6 +225,9 @@ protected:
   virtual void confirmation_message_complete (void);
   virtual void error_message_complete (void);
   virtual JAWS_Handler_Factory *factory (void);
+  virtual void task (JAWS_Pipeline_Handler *ph);
+  virtual JAWS_Pipeline_Handler *task (void);
+
 
 private:
   ACE_Message_Block *state_;
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Server.cpp b/apps/JAWS/PROTOTYPE/JAWS/Server.cpp
index 16949bb63d1..3e183545010 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Server.cpp
+++ b/apps/JAWS/PROTOTYPE/JAWS/Server.cpp
@@ -71,8 +71,8 @@ JAWS_Server::open (JAWS_Pipeline_Handler *protocol)
       ACE_DEBUG ((LM_DEBUG, "JAWS_Server::open, can't create handler\n"));
       return -1;
     }
-  ACE_UNUSED_ARG (protocol);
-  // handler->task (protocol);
+
+  handler->task (protocol);
 
   // initialize data block
   db = new JAWS_Data_Block;
diff --git a/apps/JAWS/PROTOTYPE/Makefile b/apps/JAWS/PROTOTYPE/Makefile
index a706db00c96..c24943dc8ef 100644
--- a/apps/JAWS/PROTOTYPE/Makefile
+++ b/apps/JAWS/PROTOTYPE/Makefile
@@ -21,7 +21,7 @@ VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 LDLIBS  = -lJAWS
 
-BUILD 	= $(LDLIBS) $(VBIN)
+BUILD 	= $(VBIN)
 
 #----------------------------------------------------------------------------
 #	Include macros and targets