From 66152c19d85faf66c8b294cf59c64e9d168bd661 Mon Sep 17 00:00:00 2001 From: Martin Regen Date: Mon, 29 May 2017 09:55:52 +0200 Subject: [PATCH] session close should always return good --- .../SDK/Opc.Ua.Server/Server/StandardServer.cs | 5 ----- .../SDK/Opc.Ua.Server/Session/SessionManager.cs | 6 +----- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/SampleApplications/SDK/Opc.Ua.Server/Server/StandardServer.cs b/SampleApplications/SDK/Opc.Ua.Server/Server/StandardServer.cs index ee84275320..23e3c0f7ee 100644 --- a/SampleApplications/SDK/Opc.Ua.Server/Server/StandardServer.cs +++ b/SampleApplications/SDK/Opc.Ua.Server/Server/StandardServer.cs @@ -673,11 +673,6 @@ namespace Opc.Ua.Server } catch (ServiceResultException e) { - if (e.StatusCode == StatusCodes.BadSessionNotActivated) - { - return CreateResponse(requestHeader, e); - } - lock (ServerInternal.DiagnosticsWriteLock) { ServerInternal.ServerDiagnostics.RejectedRequestsCount++; diff --git a/SampleApplications/SDK/Opc.Ua.Server/Session/SessionManager.cs b/SampleApplications/SDK/Opc.Ua.Server/Session/SessionManager.cs index 724d899953..637e5616f7 100644 --- a/SampleApplications/SDK/Opc.Ua.Server/Session/SessionManager.cs +++ b/SampleApplications/SDK/Opc.Ua.Server/Session/SessionManager.cs @@ -404,6 +404,7 @@ namespace Opc.Ua.Server // remember activation bool activated = session.Activated; + bool validated = session.ValidatedBeforeActivate; // close the session. session.Close(); @@ -413,11 +414,6 @@ namespace Opc.Ua.Server { m_server.ServerDiagnostics.CurrentSessionCount--; } - - if (!activated) - { - throw new ServiceResultException(StatusCodes.BadSessionNotActivated); - } } }