Index: /applications/editors/josm/plugins/native-password-manager/src/org/netbeans/modules/keyring/fallback/FallbackProvider.java
===================================================================
--- /applications/editors/josm/plugins/native-password-manager/src/org/netbeans/modules/keyring/fallback/FallbackProvider.java	(revision 34633)
+++ /applications/editors/josm/plugins/native-password-manager/src/org/netbeans/modules/keyring/fallback/FallbackProvider.java	(revision 34634)
@@ -43,4 +43,5 @@
 package org.netbeans.modules.keyring.fallback;
 
+import java.nio.charset.StandardCharsets;
 import java.security.SecureRandom;
 import java.util.logging.Level;
@@ -90,5 +91,5 @@
         byte[] randomArray = new byte[36];
         new SecureRandom().nextBytes(randomArray);
-        if (_save(SAMPLE_KEY, (SAMPLE_KEY + new String(randomArray)).toCharArray(),
+        if (_save(SAMPLE_KEY, (SAMPLE_KEY + new String(randomArray, StandardCharsets.UTF_8)).toCharArray(),
                 "Sample value ensuring that decryption is working.")) {
             LOG.fine("saved sample key");
Index: /applications/editors/josm/plugins/native-password-manager/src/org/netbeans/modules/keyring/kde/KWalletProvider.java
===================================================================
--- /applications/editors/josm/plugins/native-password-manager/src/org/netbeans/modules/keyring/kde/KWalletProvider.java	(revision 34633)
+++ /applications/editors/josm/plugins/native-password-manager/src/org/netbeans/modules/keyring/kde/KWalletProvider.java	(revision 34634)
@@ -46,4 +46,5 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.logging.Level;
@@ -96,5 +97,5 @@
             CommandResult result = runCommand("writePassword", handler , getApplicationName()
                     , key.toCharArray(), password , getApplicationName());
-            if (result.exitCode != 0 || (new String(result.retVal)).equals("-1")){
+            if (result.exitCode != 0 || new String(result.retVal).equals("-1")) {
                 warning("save action failed");
             }
@@ -109,5 +110,5 @@
             CommandResult result = runCommand("removeEntry" ,handler,
             getApplicationName() , key.toCharArray() , getApplicationName());
-             if (result.exitCode != 0  || (new String(result.retVal)).equals("-1")){
+             if (result.exitCode != 0  || new String(result.retVal).equals("-1")) {
                 warning("delete action failed");
             }
@@ -176,5 +177,5 @@
             Process pr = rt.exec(argv);
             
-            try (BufferedReader input = new BufferedReader(new InputStreamReader(pr.getInputStream()))) {
+            try (BufferedReader input = new BufferedReader(new InputStreamReader(pr.getInputStream(), StandardCharsets.UTF_8))) {
 
                 String line;
@@ -186,5 +187,5 @@
                 }            
             }
-            try (BufferedReader input = new BufferedReader(new InputStreamReader(pr.getErrorStream()))) {
+            try (BufferedReader input = new BufferedReader(new InputStreamReader(pr.getErrorStream(), StandardCharsets.UTF_8))) {
 
                 String line;
Index: /applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/DatatypeConverter.java
===================================================================
--- /applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/DatatypeConverter.java	(revision 34633)
+++ /applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/DatatypeConverter.java	(revision 34634)
@@ -117,5 +117,5 @@
                 }
                 if (quadruplet[3] != PADDING) {
-                    out[o++] = (byte) ((quadruplet[2] << 6) | (quadruplet[3]));
+                    out[o++] = (byte) ((quadruplet[2] << 6) | quadruplet[3]);
                 }
                 q = 0;
@@ -195,5 +195,5 @@
         if (remaining == 1) {
             buf[ptr++] = encode(input[i] >> 2);
-            buf[ptr++] = encode(((input[i]) & 0x3) << 4);
+            buf[ptr++] = encode((input[i] & 0x3) << 4);
             buf[ptr++] = '=';
             buf[ptr++] = '=';
Index: /applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java
===================================================================
--- /applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java	(revision 34633)
+++ /applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java	(revision 34634)
@@ -7,4 +7,5 @@
 import java.net.Authenticator.RequestorType;
 import java.net.PasswordAuthentication;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -63,5 +64,5 @@
         
         CRC32 id = new CRC32();
-        id.update((pref+"/"+url).getBytes());
+        id.update((pref+"/"+url).getBytes(StandardCharsets.UTF_8));
         
         String hash = Integer.toHexString((int)id.getValue());
@@ -76,5 +77,5 @@
         
         CRC32 id = new CRC32();
-        id.update((pref+"/"+host+"/"+port).getBytes());
+        id.update((pref+"/"+host+"/"+port).getBytes(StandardCharsets.UTF_8));
 
         String hash = Integer.toHexString((int)id.getValue());
@@ -88,5 +89,5 @@
         
         CRC32 id = new CRC32();
-        id.update((pref).getBytes());
+        id.update(pref.getBytes(StandardCharsets.UTF_8));
 
         String hash = Integer.toHexString((int)id.getValue());