From 4692b21087f43efb68f2d21c4ee1371441688e70 Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Wed, 2 Dec 2009 19:47:21 +0300
Subject: [PATCH] fix NPE

---
 .../debugger/actions/CompareValueWithClipboardAction.java   | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/CompareValueWithClipboardAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/CompareValueWithClipboardAction.java
index 012f1ba8e2..ab449e0eec 100644
--- a/java/debugger/impl/src/com/intellij/debugger/actions/CompareValueWithClipboardAction.java
+++ b/java/debugger/impl/src/com/intellij/debugger/actions/CompareValueWithClipboardAction.java
@@ -16,10 +16,10 @@
 package com.intellij.debugger.actions;
 
 import com.intellij.debugger.DebuggerBundle;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.diff.*;
 import com.intellij.openapi.ide.CopyPasteManager;
 import com.intellij.openapi.project.Project;
-import org.jetbrains.annotations.Nullable;
 
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
@@ -29,6 +29,7 @@ import java.awt.datatransfer.Transferable;
  * @author Jeka
  */
 public class CompareValueWithClipboardAction extends BaseValueAction {
+  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.actions.CompareValueWithClipboardAction");
   protected void processText(final Project project, final String text) {
     DiffManager.getInstance().getDiffTool().show(new ClipboardSelectionContents(text, project));
   }
@@ -65,16 +66,16 @@ public class CompareValueWithClipboardAction extends BaseValueAction {
       return DebuggerBundle.message("diff.clipboard.vs.value.dialog.title");
     }
 
-    @Nullable
     private static DiffContent createClipboardContent() {
       Transferable content = CopyPasteManager.getInstance().getContents();
-      String text;
+      String text = "";
       try {
         text = (String) (content.getTransferData(DataFlavor.stringFlavor));
-      } catch (Exception e) {
-        return null;
       }
-      return text != null ? new SimpleContent(text) : null;
+      catch (Exception e) {
+        LOG.info(e);
+      }
+      return new SimpleContent(text);
     }
   }
 }
\ No newline at end of file
-- 
2.11.4.GIT