Fixed Issue http://www.netbeans.org/issues/show_bug.cgi?id=124893
authordbotterill@netbeans.org
Wed, 09 Jan 2008 04:47:30 +0000
changeset 2799489448bd8a78
parent 2798 cc58c61b2b0e
child 2800 80af504a651b
Fixed Issue http://www.netbeans.org/issues/show_bug.cgi?id=124893
pluginportal/PluginSystem/src/org/netbeans/pluginportal/system/SystemFileUtils.java
pluginportal/PluginSystem/src/org/netbeans/pluginportal/system/impl/UpdateCenterCache.java
     1.1 --- a/pluginportal/PluginSystem/src/org/netbeans/pluginportal/system/SystemFileUtils.java	Tue Jan 08 20:30:40 2008 +0000
     1.2 +++ b/pluginportal/PluginSystem/src/org/netbeans/pluginportal/system/SystemFileUtils.java	Wed Jan 09 04:47:30 2008 +0000
     1.3 @@ -199,6 +199,8 @@
     1.4              writer.flush();
     1.5              writer.close();
     1.6              reader.close();
     1.7 +        } else {
     1.8 +            return null;
     1.9          }
    1.10          
    1.11          return returnFile;
     2.1 --- a/pluginportal/PluginSystem/src/org/netbeans/pluginportal/system/impl/UpdateCenterCache.java	Tue Jan 08 20:30:40 2008 +0000
     2.2 +++ b/pluginportal/PluginSystem/src/org/netbeans/pluginportal/system/impl/UpdateCenterCache.java	Wed Jan 09 04:47:30 2008 +0000
     2.3 @@ -256,6 +256,11 @@
     2.4              NBMDeploymentDescriptor dd=null;
     2.5              try {
     2.6                  infoFile = SystemFileUtils.extractInfoFile(inNBMFile.getAbsolutePath());
     2.7 +                if(null == infoFile) {
     2.8 +                    System.err.println("Error extracting Info.xml from NBM file:" +
     2.9 +                        inNBMFile + " skipping file...");
    2.10 +                    return;
    2.11 +                }
    2.12                  dd = new NBMDeploymentDescriptor();
    2.13                  dd.parseDeploymentDescriptor(infoFile);
    2.14                  if(null != infoFile) {