diff options
| author | René Purrio | 2018-01-17 07:26:14 +0000 |
|---|---|---|
| committer | René Purrio | 2018-01-17 11:56:21 +0000 |
| commit | 3dc65fbd62daa08bb5700a0dd70c5950caab423d (patch) | |
| tree | 3b9e6a2764215b2bc08418e466fc1ad380deffbc /examples | |
| parent | 65668f82b11c9c33730e82474f01eeeb0fcd491e (diff) | |
| download | eclipse.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 'examples')
3 files changed, 9 insertions, 3 deletions
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemOperations.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemOperations.java index d7b419a22..510fa74bb 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemOperations.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemOperations.java @@ -438,7 +438,11 @@ public class FileSystemOperations { // Remove any empty folders for (Iterator iter = toDelete.iterator(); iter.hasNext(); ) { File diskFile = (File) iter.next(); - if (diskFile.listFiles().length == 0) { + File[] fileList = diskFile.listFiles(); + if(fileList == null) { + throw new TeamException("Content from directory '" + diskFile.getAbsolutePath() + "' can not be listed."); //$NON-NLS-1$ //$NON-NLS-2$ + } + if (fileList.length == 0) { diskFile.delete(); synchronizer.flush(container, IResource.DEPTH_INFINITE); } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemResourceVariant.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemResourceVariant.java index 722935e8b..9153e96fd 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemResourceVariant.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemResourceVariant.java @@ -127,6 +127,9 @@ public class FileSystemResourceVariant extends CachedResourceVariant { public FileSystemResourceVariant[] members() { if (isContainer()) { java.io.File[] members = ioFile.listFiles(); + if (members == null) { + members = new java.io.File[0]; + } FileSystemResourceVariant[] result = new FileSystemResourceVariant[members.length]; for (int i = 0; i < members.length; i++) { result[i] = new FileSystemResourceVariant(members[i]); diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelObjectElementFile.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelObjectElementFile.java index 84ec39268..249d07add 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelObjectElementFile.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelObjectElementFile.java @@ -21,8 +21,7 @@ public class ModelObjectElementFile extends ModelFile { private final ModelObjectDefinitionFile parent; public static boolean isMoeFile(IResource resource) { - return resource instanceof IFile - && resource.getFileExtension().equals(MODEL_OBJECT_ELEMENTFILE_EXTENSION); + return resource instanceof IFile && MODEL_OBJECT_ELEMENTFILE_EXTENSION.equals(resource.getFileExtension()); } public ModelObjectElementFile(ModelObjectDefinitionFile parent, IFile file) { |