Windows: PerformanceTuningInterval Merge error

Due to a merge error, if RankServerInterval was set via the
registry, its value would also be used for the
PerformanceTuningInterval.  Fix it.

Reviewed-on: http://gerrit.openafs.org/3500
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
(cherry picked from commit 6229ffb7ae365174ccacabe00d1e986d2f9b2019)

Change-Id: I7ed0ffbffc88c25e6b586d927c8422711d2bd7b8
Reviewed-on: http://gerrit.openafs.org/3800
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/WINNT/afsd/cm_daemon.c b/src/WINNT/afsd/cm_daemon.c
index f8284332d73e5ee71cd81f64ff34823efe274eb7..201bc2d60a92acf00abdbb4f7a6a206617475889 100644 (file)
--- a/src/WINNT/afsd/cm_daemon.c
+++ b/src/WINNT/afsd/cm_daemon.c
@@ -340,6 +340,10 @@ cm_DaemonCheckInit(void)
     dummyLen = sizeof(DWORD);
     code = RegQueryValueEx(parmKey, "daemonPerformanceTuningInterval", NULL, NULL,
                            (BYTE *) &dummy, &dummyLen);
+    if (code == ERROR_SUCCESS)
+       cm_daemonPerformanceTuningInterval = dummy;
+    afsi_log("daemonPerformanceTuningInterval is %d", cm_daemonPerformanceTuningInterval);
+
     dummyLen = sizeof(DWORD);
     code = RegQueryValueEx(parmKey, "daemonRankServerInterval", NULL, NULL,
                            (BYTE *) &dummy, &dummyLen);
@@ -347,10 +351,6 @@ cm_DaemonCheckInit(void)
        cm_daemonRankServerInterval = dummy;
     afsi_log("daemonRankServerInterval is %d", cm_daemonRankServerInterval);
 
-    if (code == ERROR_SUCCESS)
-       cm_daemonPerformanceTuningInterval = dummy;
-    afsi_log("daemonPerformanceTuningInterval is %d", cm_daemonPerformanceTuningInterval);
-    
     RegCloseKey(parmKey);
 
     if (cm_daemonPerformanceTuningInterval)