Skip to content

Commit 28197f4

Browse files
Wdt 608 undo adjudicator code (#1087)
* change adjudicator only if version 12.2.1.4 or greater
1 parent e1dbe79 commit 28197f4

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

core/src/main/python/wlsdeploy/tool/create/security_provider_creator.py

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates. All rights reserved.
2+
Copyright (c) 2017, 2022, Oracle Corporation and/or its affiliates.
33
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44
"""
55

@@ -12,6 +12,7 @@
1212
from wlsdeploy.tool.create.creator import Creator
1313
from wlsdeploy.tool.deploy import deployer_utils
1414
from wlsdeploy.util import dictionary_utils
15+
from wlsdeploy.util.weblogic_helper import WebLogicHelper
1516

1617

1718
class SecurityProviderCreator(Creator):
@@ -52,6 +53,7 @@ def __init__(self, model_dictionary, model_context, aliases, exception_type, log
5253

5354
self._topology = self.model.get_model_topology()
5455
self._domain_typedef = self.model_context.get_domain_typedef()
56+
self._wls_helper = WebLogicHelper(self.logger)
5557

5658
return
5759

@@ -276,6 +278,12 @@ def _check_provider_type(self, type_name, model_nodes):
276278
:return: True if the provider type should be updated, False if it should be skipped
277279
"""
278280
_method_name = '_check_provider_type'
281+
# there are problems re-configuring adjudicators, don't update them
282+
if type_name == self.__adjudicator_type and not self.is_adjudicator_changeable():
283+
if not self._is_default_adjudicator_configuration(model_nodes):
284+
self.logger.warning('WLSDPLY-12137', class_name=self.__class_name, method_name=_method_name)
285+
286+
return False
279287

280288
return True
281289

@@ -313,3 +321,6 @@ def _is_default_adjudicator_configuration(self, model_nodes):
313321
return False
314322

315323
return True
324+
325+
def is_adjudicator_changeable(self):
326+
return self._wls_helper.is_weblogic_version_or_above('12.2.1.4')

0 commit comments

Comments
 (0)