Merge pull request #2928 from OPCFoundation/cherrypicks

Merge cherrypicks from master in develop branch

Author: mregen

Libraries/Opc.Ua.Configuration/ApplicationConfigurationBuilder.cs

@@ -66,6 +66,12 @@ public ApplicationConfigurationBuilder(ApplicationInstance applicationInstance)
 
         #region Public Methods
         /// <inheritdoc/>
+        public IApplicationConfigurationBuilderGlobalConfiguration SetHiResClockDisabled(bool disableHiResClock)
+        {
+            ApplicationConfiguration.DisableHiResClock = disableHiResClock;
+            return this;
+        }
+        /// <inheritdoc/>
         public IApplicationConfigurationBuilderClientSelected AsClient()
         {
             switch (ApplicationInstance.ApplicationType)
@@ -137,7 +143,7 @@ public IApplicationConfigurationBuilderSecurityOptions AddSecurityConfiguration(
                     StorePath = DefaultCertificateStorePath(TrustlistType.IssuerUser, pkiRoot)
                 },
                 // rejected store
-                RejectedCertificateStore = new CertificateTrustList() {
+                RejectedCertificateStore = new CertificateStoreIdentifier() {
                     StoreType = rejectedRootType,
                     StorePath = DefaultCertificateStorePath(TrustlistType.Rejected, rejectedRoot)
                 },
@@ -178,7 +184,7 @@ public IApplicationConfigurationBuilderSecurityOptionStores AddSecurityConfigura
                     StorePath = DefaultCertificateStorePath(TrustlistType.Issuer, issuerRoot)
                 },
                 // rejected store
-                RejectedCertificateStore = new CertificateTrustList() {
+                RejectedCertificateStore = new CertificateStoreIdentifier() {
                     StoreType = rejectedRootType,
                     StorePath = DefaultCertificateStorePath(TrustlistType.Rejected, rejectedRoot)
                 },

Libraries/Opc.Ua.Configuration/IApplicationConfigurationBuilder.cs

@@ -450,6 +450,7 @@ string issuerRoot
     /// Add security options to the configuration.
     /// </summary>
     public interface IApplicationConfigurationBuilderSecurityOptions :
+        IApplicationConfigurationBuilderGlobalConfiguration,
         IApplicationConfigurationBuilderTraceConfiguration,
         IApplicationConfigurationBuilderExtension,
         IApplicationConfigurationBuilderCreate
@@ -542,6 +543,20 @@ public interface IApplicationConfigurationBuilderExtension :
         IApplicationConfigurationBuilderExtension AddExtension<T>(XmlQualifiedName elementName, object value);
     }
 
+    /// <summary>
+    /// Add some global configuration settings.
+    /// </summary>
+    public interface IApplicationConfigurationBuilderGlobalConfiguration :
+        IApplicationConfigurationBuilderCreate,
+        IApplicationConfigurationBuilderTraceConfiguration
+    {
+        /// <summary>
+        /// Set the high resolution clock to disabled or enabled.
+        /// </summary>
+        /// <param name="hiResClockDisabled"><value><c>true</c> if high resolution clock is disabled; otherwise, <c>false</c>.</value></param>
+        IApplicationConfigurationBuilderGlobalConfiguration SetHiResClockDisabled(bool hiResClockDisabled);
+    }
+
     /// <summary>
     /// Add the trace configuration.
     /// </summary>

Libraries/Opc.Ua.Server/Diagnostics/CustomNodeManager.cs

@@ -2977,16 +2977,16 @@ protected virtual ServiceResult Call(
             List<ServiceResult> argumentErrors = new List<ServiceResult>();
             VariantCollection outputArguments = new VariantCollection();
 
-            ServiceResult error = method.Call(
+            ServiceResult callResult = method.Call(
                 context,
                 methodToCall.ObjectId,
                 methodToCall.InputArguments,
                 argumentErrors,
                 outputArguments);
 
-            if (ServiceResult.IsBad(error))
+            if (ServiceResult.IsBad(callResult))
             {
-                return error;
+                return callResult;
             }
 
             // check for argument errors.
@@ -3041,7 +3041,8 @@ protected virtual ServiceResult Call(
             // return output arguments.
             result.OutputArguments = outputArguments;
 
-            return ServiceResult.Good;
+            // return the actual result of the original call
+            return callResult;
         }
 
 

Stack/Opc.Ua.Core/Stack/State/MethodState.cs

@@ -706,7 +706,7 @@ public virtual ServiceResult Call(
             }
 
             // copy out arguments.
-            if (ServiceResult.IsGood(result))
+            if (ServiceResult.IsGoodOrUncertain(result))
             {
                 for (int ii = 0; ii < outputs.Count; ii++)
                 {

Stack/Opc.Ua.Core/Types/Utils/ServiceResult.cs

@@ -524,6 +524,19 @@ public static bool IsUncertain(ServiceResult status)
             return false;
         }
 
+        /// <summary>
+        /// Returns true if the status code is good or uncertain.
+        /// </summary>
+        public static bool IsGoodOrUncertain(ServiceResult status)
+        {
+            if (status != null)
+            {
+                return StatusCode.IsGood(status.m_code) || StatusCode.IsUncertain(status.m_code);
+            }
+
+            return false;
+        }
+
         /// <summary>
         /// Returns true if the status is good or uncertain.
         /// </summary>