Index: telco-6.4/storage/ndb/src/kernel/blocks/LocalProxy.cpp
===================================================================
--- telco-6.4.orig/storage/ndb/src/kernel/blocks/LocalProxy.cpp	2009-04-16 10:14:25.000000000 +0200
+++ telco-6.4/storage/ndb/src/kernel/blocks/LocalProxy.cpp	2009-04-16 10:15:47.000000000 +0200
@@ -83,7 +83,6 @@ LocalProxy::LocalProxy(BlockNumber block
   addRecSignal(GSN_DROP_TRIG_IMPL_REQ, &LocalProxy::execDROP_TRIG_IMPL_REQ);
   addRecSignal(GSN_DROP_TRIG_IMPL_CONF, &LocalProxy::execDROP_TRIG_IMPL_CONF);
   addRecSignal(GSN_DROP_TRIG_IMPL_REF, &LocalProxy::execDROP_TRIG_IMPL_REF);
-
 }
 
 LocalProxy::~LocalProxy()
@@ -681,6 +680,7 @@ LocalProxy::execNODE_STATE_REP(Signal* s
 {
   Ss_NODE_STATE_REP& ss = ssSeize<Ss_NODE_STATE_REP>();
   sendREQ(signal, ss);
+  SimulatedBlock::execNODE_STATE_REP(signal);
   ssRelease<Ss_NODE_STATE_REP>(ss);
 }
 
@@ -689,8 +689,6 @@ LocalProxy::sendNODE_STATE_REP(Signal* s
 {
   Ss_NODE_STATE_REP& ss = ssFind<Ss_NODE_STATE_REP>(ssId);
 
-//NodeStateRep * req = (NodeStateRep*)signal->getDataPtrSend();
-
   sendSignal(workerRef(ss.m_worker), GSN_NODE_STATE_REP,
              signal,NodeStateRep::SignalLength, JBB);
 }
@@ -738,8 +736,12 @@ LocalProxy::sendCHANGE_NODE_STATE_CONF(S
   if (!lastReply(ss))
     return;
 
-  sendSignal(ss.m_req.senderRef, GSN_CHANGE_NODE_STATE_CONF,
-             signal, ChangeNodeStateConf::SignalLength, JBB);
+  /**
+   * SimulatedBlock::execCHANGE_NODE_STATE_REQ will reply
+   */
+  ChangeNodeStateReq * req = (ChangeNodeStateReq*)signal->getDataPtrSend();
+  * req = ss.m_req;
+  SimulatedBlock::execCHANGE_NODE_STATE_REQ(signal);
   ssRelease<Ss_CHANGE_NODE_STATE_REQ>(ssId);
 }
 
Index: telco-6.4/storage/ndb/src/kernel/blocks/LocalProxy.hpp
===================================================================
--- telco-6.4.orig/storage/ndb/src/kernel/blocks/LocalProxy.hpp	2009-04-16 10:14:25.000000000 +0200
+++ telco-6.4/storage/ndb/src/kernel/blocks/LocalProxy.hpp	2009-04-16 10:15:47.000000000 +0200
@@ -468,7 +468,6 @@ protected:
   void execCHANGE_NODE_STATE_CONF(Signal*);
   void sendCHANGE_NODE_STATE_CONF(Signal*, Uint32 ssId);
 
-
   // GSN_DUMP_STATE_ORD
   struct Ss_DUMP_STATE_ORD : SsParallel {
     Uint32 m_reqlength;