diff options
| author | Chris Aniszczyk | 2011-02-24 17:37:14 +0000 |
|---|---|---|
| committer | Code Review | 2011-02-24 17:37:14 +0000 |
| commit | 488d7beb621be7f6acc61a7c5ed4919d08c07e91 (patch) | |
| tree | 307b4ed4ee5fdd18eb568b4d1cb69f75753fca19 | |
| parent | 45c1a24ca9eac40fc83ff021b53c450a3b28ae56 (diff) | |
| parent | 69a488e54619713aa9258c144e2b3755f64e5c98 (diff) | |
| download | egit-488d7beb621be7f6acc61a7c5ed4919d08c07e91.tar.gz egit-488d7beb621be7f6acc61a7c5ed4919d08c07e91.tar.xz egit-488d7beb621be7f6acc61a7c5ed4919d08c07e91.zip | |
Merge "Fix NPE in DropAdapterAssistant"
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/DropAdapterAssistant.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/DropAdapterAssistant.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/DropAdapterAssistant.java index 91bfbf15a6..a985dda3f0 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/DropAdapterAssistant.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/DropAdapterAssistant.java @@ -62,6 +62,8 @@ public class DropAdapterAssistant extends CommonDropAdapterAssistant { // check that all paths are valid repository paths String[] folders = (String[]) FileTransfer.getInstance().nativeToJava( transferData); + if (folders == null) + return Status.CANCEL_STATUS; for (String folder : folders) { File repoFile = new File(folder); if (FileKey.isGitRepository(repoFile, FS.DETECTED)) { |