Fix RHEL 7 compile error.

Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/edb10f12
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/edb10f12
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/edb10f12

Branch: refs/heads/master
Commit: edb10f1288f79efae7edb4d6ce66ec67cd6b6856
Parents: 4d05071
Author: Zalo Correa <[email protected]>
Authored: Tue Jun 5 06:27:07 2018 -0700
Committer: Zalo Correa <[email protected]>
Committed: Tue Jun 5 06:27:07 2018 -0700

----------------------------------------------------------------------
 core/sqf/monitor/linux/process.cxx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafodion/blob/edb10f12/core/sqf/monitor/linux/process.cxx
----------------------------------------------------------------------
diff --git a/core/sqf/monitor/linux/process.cxx 
b/core/sqf/monitor/linux/process.cxx
index 3a3e699..9b9ee00 100644
--- a/core/sqf/monitor/linux/process.cxx
+++ b/core/sqf/monitor/linux/process.cxx
@@ -5209,6 +5209,7 @@ CProcess *CProcessContainer::CompleteProcessStartup (char 
*process_name,
     {
         if (process->GetPid() != os_pid)
         { // Process id changed from when we started the process.
+#ifndef NAMESERVER_PROCESS
             if ( !process->IsUnhooked() )
             {   // Parent process object keeps track of child processes
                 // created on this node.  Needed in case parent process
@@ -5226,7 +5227,6 @@ CProcess *CProcessContainer::CompleteProcessStartup (char 
*process_name,
                     parentPid = process->GetPairParentPid();
                 }
 
-#ifndef NAMESERVER_PROCESS
                 if ( parentNid != -1 && parentPid != -1 )
                 {
                     CProcess* parent;
@@ -5239,9 +5239,7 @@ CProcess *CProcessContainer::CompleteProcessStartup (char 
*process_name,
                         parent->childAdd ( process->GetNid(), os_pid );
                     }
                 }
-#endif
             }
-#ifndef NAMESERVER_PROCESS
             if (NameServerEnabled)
             {
                 if (process->IsUnhooked())

Reply via email to