Skip to content

Commit 0418165

Browse files
committed
Merge branch 'secret-charset-issue' into 'main'
Resolving a character set issue when reading passwords from secrets See merge request weblogic-cloud/weblogic-deploy-tooling!1782
2 parents 8b113c5 + cecedc3 commit 0418165

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

core/src/main/python/wlsdeploy/util/variables.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@
99
from java.lang import System
1010
from java.io import BufferedReader
1111
from java.io import File
12+
from java.io import FileInputStream
1213
from java.io import FileOutputStream
13-
from java.io import FileReader
14+
from java.io import InputStreamReader
1415
from java.io import PrintWriter
1516
from java.io import IOException
17+
from java.nio.charset import StandardCharsets
1618

1719
from oracle.weblogic.deploy.util import PyOrderedDict as OrderedDict
1820

@@ -395,7 +397,7 @@ def _read_value_from_file(file_path, allow_unresolved):
395397
method_name = '_read_value_from_file'
396398

397399
try:
398-
file_reader = BufferedReader(FileReader(file_path))
400+
file_reader = BufferedReader(InputStreamReader(FileInputStream(file_path), StandardCharsets.UTF_8))
399401
line = file_reader.readLine()
400402
file_reader.close()
401403
except IOException, e:

0 commit comments

Comments
 (0)