Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRené Purrio2018-01-17 07:26:14 +0000
committerRené Purrio2018-01-17 11:56:21 +0000
commit3dc65fbd62daa08bb5700a0dd70c5950caab423d (patch)
tree3b9e6a2764215b2bc08418e466fc1ad380deffbc /bundles/org.eclipse.team.cvs.ui
parent65668f82b11c9c33730e82474f01eeeb0fcd491e (diff)
downloadeclipse.platform.team-3dc65fbd62daa08bb5700a0dd70c5950caab423d.tar.gz
eclipse.platform.team-3dc65fbd62daa08bb5700a0dd70c5950caab423d.tar.xz
eclipse.platform.team-3dc65fbd62daa08bb5700a0dd70c5950caab423d.zip
Bug 529824 - [sonar] Resolve "Possible null pointer dereference"I20180119-0110I20180118-2000
Change-Id: I1a4ce29ea6ee3c49b6d218b0c1063415f72466c5 Signed-off-by: René Purrio <rpurrio@itemis.de>
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui')
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/WorkspaceFileDiffOperation.java22
1 files changed, 18 insertions, 4 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/WorkspaceFileDiffOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/WorkspaceFileDiffOperation.java
index 39531c8ea..e6c148d5d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/WorkspaceFileDiffOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/WorkspaceFileDiffOperation.java
@@ -10,11 +10,21 @@
*******************************************************************************/
package org.eclipse.team.internal.ccvs.ui.operations;
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
-import org.eclipse.core.resources.*;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.resources.mapping.ResourceMapping;
-import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
import org.eclipse.team.internal.ccvs.core.CVSException;
import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
import org.eclipse.ui.IWorkbenchPart;
@@ -28,7 +38,11 @@ public class WorkspaceFileDiffOperation extends FileDiffOperation {
protected void copyFile() throws CVSException {
IWorkspaceRoot root =ResourcesPlugin.getWorkspace().getRoot();
- IFile finalFile = root.getFileForLocation(new Path(this.file.getPath()));
+ String filePath = this.file.getPath();
+ IFile finalFile = root.getFileForLocation(new Path(filePath));
+ if(finalFile == null) {
+ throw new CVSException("File '" + filePath + "' can not be found in workspace."); //$NON-NLS-1$ //$NON-NLS-2$
+ }
InputStream fileInputStream = null;
try {
fileInputStream = new BufferedInputStream(new FileInputStream(tempFile));

Back to the top