Fix

5 files changed, 9 insertions, 13 deletions

diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index 34083e75c8c..3f37de2fee7 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -19,7 +19,7 @@ prefix			= /opt/Ice-$(VERSION)
 # optimization. Otherwise Ice is build with debug information.
 #
 
-OPTIMIZE		= yes
+#OPTIMIZE		= yes
 
 #
 # Define LP64 as yes if you want to build in 64 bit mode on a platform
diff --git a/cpp/src/IceStorm/SubscriberFactory.cpp b/cpp/src/IceStorm/SubscriberFactory.cpp
index f6a39c74638..861c203bacf 100644
--- a/cpp/src/IceStorm/SubscriberFactory.cpp
+++ b/cpp/src/IceStorm/SubscriberFactory.cpp
@@ -120,10 +120,6 @@ SubscriberFactory::createSubscriber(const QoS& qos, const Ice::ObjectPrx& obj)
     //
     // Check if a queued proxy already exists, or create one if necessary.
     //
-    // TODO: a twoway unordered and a twoway ordered proxy will be
-    // cached with the same entry in the _proxies map. Does this need
-    // to be fixed?
-    //
     QueuedProxyPtr proxy;
     map<Ice::ObjectPrx, ProxyInfo>::iterator p = _proxies.find(newObj);
     if(p != _proxies.end())
diff --git a/cpp/src/IceStorm/TwowayProxy.cpp b/cpp/src/IceStorm/TwowayProxy.cpp
index aae10ae4edc..15a2c629ebc 100644
--- a/cpp/src/IceStorm/TwowayProxy.cpp
+++ b/cpp/src/IceStorm/TwowayProxy.cpp
@@ -74,8 +74,7 @@ void
 IceStorm::UnorderedTwowayProxy::deliver(const EventPtr& event)
 {
     //
-    // TODO: Use a buffer of AMI callback objects to eliminate the dynamic memory allocation? Is 
-    // using AMI.
+    // TODO: Use a buffer of AMI callback objects to eliminate the dynamic memory allocation?
     //
     _obj->ice_invoke_async(new UnorderedInvokeCB(this), event->op, Ice::Idempotent, event->data, event->context);
 }
@@ -117,7 +116,7 @@ private:
 };
 
 IceStorm::OrderedTwowayProxy::OrderedTwowayProxy(const Ice::ObjectPrx& obj) : 
-    TwowayProxy(obj), _amiCB(new OrderedInvokeCB(this))
+    TwowayProxy(obj)
 {
 }
 
@@ -195,6 +194,10 @@ IceStorm::OrderedTwowayProxy::response()
 void
 IceStorm::OrderedTwowayProxy::deliver(const EventPtr& event)
 {
-    _obj->ice_invoke_async(_amiCB, event->op, Ice::Idempotent, event->data, event->context);
+    //
+    // TODO: Use a buffer of AMI callback objects to eliminate the dynamic memory allocation? (we could 
+    // actually use only 2 AMI callback objects there.)
+    //
+    _obj->ice_invoke_async(new OrderedInvokeCB(this), event->op, Ice::Idempotent, event->data, event->context);
 }
 
diff --git a/cpp/src/IceStorm/TwowayProxy.h b/cpp/src/IceStorm/TwowayProxy.h
index 57f5d0fde18..c51e11652d2 100644
--- a/cpp/src/IceStorm/TwowayProxy.h
+++ b/cpp/src/IceStorm/TwowayProxy.h
@@ -50,9 +50,6 @@ protected:
     virtual void deliver(const EventPtr&);
     void send(IceUtil::Mutex::Lock&);
 
-private:
-    
-    const Ice::AMI_Object_ice_invokePtr _amiCB;
 };
 
 typedef IceUtil::Handle<OrderedTwowayProxy> OrderedTwowayProxyPtr;
diff --git a/cpp/test/IceStorm/single/Subscriber.cpp b/cpp/test/IceStorm/single/Subscriber.cpp
index eafd6ced5b5..2a5a6b5e2f3 100644
--- a/cpp/test/IceStorm/single/Subscriber.cpp
+++ b/cpp/test/IceStorm/single/Subscriber.cpp
@@ -173,7 +173,7 @@ run(int argc, char* argv[], const CommunicatorPtr& communicator)
     {
 	subscribers.push_back(new SingleI(communicator, "twoway ordered", true)); // Ordered
 	IceStorm::QoS qos;
-	qos["reliability"] = "twoway-ordered";
+	qos["reliability"] = "twoway ordered";
 	topic->subscribe(qos, adapter->addWithUUID(subscribers.back()));
     }