From ade300c6d40cc9f6689ebfdd834b90fa7b585c5a Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Mon, 25 Aug 2014 08:33:49 +0200
Subject: [PATCH] NotNull

---
 .../com/intellij/openapi/util/PasswordUtil.java    | 14 ++++++++++----
 .../com/intellij/openapi/diagnostic/Logger.java    |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/openapi/util/PasswordUtil.java b/platform/platform-api/src/com/intellij/openapi/util/PasswordUtil.java
index 4ba3fa7c1516..c4995a34ac27 100644
--- a/platform/platform-api/src/com/intellij/openapi/util/PasswordUtil.java
+++ b/platform/platform-api/src/com/intellij/openapi/util/PasswordUtil.java
@@ -15,13 +15,17 @@
  */
 package com.intellij.openapi.util;
 
+import org.jetbrains.annotations.Nullable;
+
 public class PasswordUtil {
   private PasswordUtil() { }
 
   // weak encryption just to avoid plain text passwords in text files
-  public static String encodePassword(String password) {
+  public static String encodePassword(@Nullable String password) {
     String result = "";
-    if (password == null) return result;
+    if (password == null) {
+      return result;
+    }
     for (int i = 0; i < password.length(); i++) {
       int c = password.charAt(i);
       c ^= 0xdfaa;
@@ -30,9 +34,11 @@ public class PasswordUtil {
     return result;
   }
 
-  public static String decodePassword(String password) throws NumberFormatException {
+  public static String decodePassword(@Nullable String password) throws NumberFormatException {
     String result = "";
-    if (password == null) return result;
+    if (password == null) {
+      return result;
+    }
     for (int i = 0; i < password.length(); i += 4) {
       String s = password.substring(i, i + 4);
       int c = Integer.parseInt(s, 16);
diff --git a/platform/util/src/com/intellij/openapi/diagnostic/Logger.java b/platform/util/src/com/intellij/openapi/diagnostic/Logger.java
index f3da0c22fde5..d90876fe6be9 100644
--- a/platform/util/src/com/intellij/openapi/diagnostic/Logger.java
+++ b/platform/util/src/com/intellij/openapi/diagnostic/Logger.java
@@ -69,6 +69,7 @@ public abstract class Logger {
     return ourFactory.getLoggerInstance(category);
   }
 
+  @NotNull
   public static Logger getInstance(Class cl) {
     return getInstance("#" + cl.getName());
   }