svn commit: r1056458 - in /ant/ivy/core/trunk: src/java/org/apache/ivy/osgi/updatesite/xml/EclipseUpdateSiteParser.java test/java/org/apache/ivy/osgi/updatesite/UpdateSiteLoaderTest.java

[hibou]

Author: hibou
Date: Fri Jan  7 18:59:59 2011
New Revision: 1056458

URL: http://svn.apache.org/viewvc?rev=1056458&view=rev
Log:
fix a NPE and remove a not working test

Modified:
    
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/updatesite/xml/EclipseUpdateSiteParser.java
    
ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteLoaderTest.java

Modified: 
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/updatesite/xml/EclipseUpdateSiteParser.java
URL: 
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/updatesite/xml/EclipseUpdateSiteParser.java?rev=1056458&r1=1056457&r2=1056458&view=diff
==============================================================================
--- 
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/updatesite/xml/EclipseUpdateSiteParser.java
 (original)
+++ 
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/updatesite/xml/EclipseUpdateSiteParser.java
 Fri Jan  7 18:59:59 2011
@@ -82,6 +82,8 @@ public class EclipseUpdateSiteParser {
         }
 
         protected void handleAttributes(Attributes atts) {
+            updatesite = new UpdateSite();
+
             String url = atts.getValue(URL);
             if (url != null && !("".equals(url.trim()))) {
                 if (!url.endsWith("/") && !url.endsWith(File.separator)) {

Modified: 
ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteLoaderTest.java
URL: 
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteLoaderTest.java?rev=1056458&r1=1056457&r2=1056458&view=diff
==============================================================================
--- 
ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteLoaderTest.java
 (original)
+++ 
ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteLoaderTest.java
 Fri Jan  7 18:59:59 2011
@@ -32,11 +32,5 @@ public class UpdateSiteLoaderTest extend
         RepoDescriptor site = 
loader.load("http://www.apache.org/dist/ant/ivyde/updatesite/";);
         assertEquals(13, site.getModules().size());
     }
-    
 
-    public void testEclipse() throws IOException, ParseException, SAXException 
{
-        UpdateSiteLoader loader = new UpdateSiteLoader();
-        RepoDescriptor site = 
loader.load("http://download.eclipse.org/releases/helios/";);
-        assertEquals(13, site.getModules().size());
-    }
 }