mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-04 14:55:41 +02:00
Code Issues Wiki Activity

[203501] fix NPE in PFMetadataLocation

Browse source
This commit is contained in:
David Dykstal 2007-12-19 21:32:16 +00:00
parent 54b801b1c9
commit 1c1fb2d1bd
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/PFMetadataLocation.java
View file

@ -49,6 +49,7 @@ class PFMetadataLocation implements PFPersistenceLocation {
public PFPersistenceLocation[] getChildren() { public PFPersistenceLocation[] getChildren() {
File[] members = _baseFolder.listFiles(); File[] members = _baseFolder.listFiles();
if (members == null) members = new File[0];
List children = new ArrayList(members.length); List children = new ArrayList(members.length);
for (int i = 0; i < members.length; i++) { for (int i = 0; i < members.length; i++) {
File member = members[i]; File member = members[i];
@ -87,6 +88,7 @@ class PFMetadataLocation implements PFPersistenceLocation {
public void keepChildren(Set keepSet) { public void keepChildren(Set keepSet) {
File[] children = _baseFolder.listFiles(); File[] children = _baseFolder.listFiles();
if (children == null) children = new File[0];
for (int i = 0; i < children.length; i++) { for (int i = 0; i < children.length; i++) {
File child = children[i]; File child = children[i];
if (!keepSet.contains(child.getName())) { if (!keepSet.contains(child.getName())) {
@ -96,6 +98,7 @@ class PFMetadataLocation implements PFPersistenceLocation {
} }
public void setContents(InputStream stream) { public void setContents(InputStream stream) {
ensure();
OutputStream out = null; OutputStream out = null;
try { try {
out = new FileOutputStream(getContentsFile()); out = new FileOutputStream(getContentsFile());
@ -130,6 +133,7 @@ class PFMetadataLocation implements PFPersistenceLocation {
* @param file the file to delete. * @param file the file to delete.
*/ */
private void deleteFile(File file) { private void deleteFile(File file) {
if (file.exists()) {
if (file.isDirectory()) { if (file.isDirectory()) {
File[] children = file.listFiles(); File[] children = file.listFiles();
for (int i = 0; i < children.length; i++) { for (int i = 0; i < children.length; i++) {
@ -139,6 +143,7 @@ class PFMetadataLocation implements PFPersistenceLocation {
} }
file.delete(); file.delete();
} }
}
private File getContentsFile() { private File getContentsFile() {
File contentsFile = new File(_baseFolder, PFConstants.PROPERTIES_FILE_NAME); File contentsFile = new File(_baseFolder, PFConstants.PROPERTIES_FILE_NAME);

6
rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/PFPersistenceLocation.java
View file

@ -42,7 +42,8 @@ interface PFPersistenceLocation {
/** /**
* @return the locations of the children of this location. It is possible * @return the locations of the children of this location. It is possible
* for a location to have both contents and children. * for a location to have both contents and children. Since this location
* is a handle it may not exist, in which case this returns an empty array.
*/ */
PFPersistenceLocation[] getChildren(); PFPersistenceLocation[] getChildren();
@ -63,6 +64,7 @@ interface PFPersistenceLocation {
/** /**
* Keeps only those children from this location that are in the keep set. * Keeps only those children from this location that are in the keep set.
* Typically used to clean renamed nodes from the tree on a save operation. * Typically used to clean renamed nodes from the tree on a save operation.
* If the location does not yet exist, this does nothing.
* @param keepSet The names of the children that should be kept. Others are discarded. * @param keepSet The names of the children that should be kept. Others are discarded.
*/ */
void keepChildren(Set keepSet); void keepChildren(Set keepSet);
@ -70,6 +72,7 @@ interface PFPersistenceLocation {
/** /**
* Sets the contents of this location to a particular stream. * Sets the contents of this location to a particular stream.
* Implementations must close this stream when finished. * Implementations must close this stream when finished.
* This forces the location to come into existence if it does not already exist.
* @param stream the stream from which to read the new contents of this location. * @param stream the stream from which to read the new contents of this location.
*/ */
void setContents(InputStream stream); void setContents(InputStream stream);
@ -77,6 +80,7 @@ interface PFPersistenceLocation {
/** /**
* Returns an open stream which can be read to retrieve the contents of this * Returns an open stream which can be read to retrieve the contents of this
* location. The client is responsible for closing this stream. * location. The client is responsible for closing this stream.
* If the location does not yet exist this will return null and log the attempt.
* @return a stream that will retrieve the contents of this location. * @return a stream that will retrieve the contents of this location.
*/ */
InputStream getContents(); InputStream getContents();