ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xav...@apache.org
Subject svn commit: r729874 - in /ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse: CHANGES.txt src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java
Date Mon, 29 Dec 2008 11:55:00 GMT
Author: xavier
Date: Mon Dec 29 03:54:59 2008
New Revision: 729874

URL: http://svn.apache.org/viewvc?rev=729874&view=rev
Log:
FIX: NPE when a project:/// path is used and path does not exist (IVYDE-144)

Modified:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt?rev=729874&r1=729873&r2=729874&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt Mon Dec 29 03:54:59 2008
@@ -5,6 +5,7 @@
 ==========================
 - FIX: When migrating from ivyde alpha to ivyde beta eclipse is throwing NPE at startup (IVYDE-136)
(thanks to Daniel Becheanu)
 - FIX: The retrieve configuration doesn't support '*' as accepted types (IVYDE-137) (thanks
to Daniel Becheanu)
+- FIX: NPE when a project:/// path is used and path does not exist (IVYDE-144)
 
   version 2.0.0 beta1
 ==========================

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java?rev=729874&r1=729873&r2=729874&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java
Mon Dec 29 03:54:59 2008
@@ -356,7 +356,7 @@
     }
 
     private void setConfStatus(IvyDEException e) {
-        if (!editing && confOk != (e == null)) {
+        if (!editing) {
             confOk = (e == null);
             IvyPlugin.getDefault().getContainerDecorator().statusChaged(this);
             if (e != null) {
@@ -439,6 +439,13 @@
             String path = settingsPath.substring(pathIndex + 1);
             if (projectName.equals("")) {
                 IFile f = javaProject.getProject().getFile(path);
+                if (!f.exists()) {
+                    IvyDEException ex = new IvyDEException("Ivy settings file not found",
+                        "The Ivy settings file '" + ivySettingsPath + "' cannot be found
("
+                                + this.toString() + ")", null);
+                    setConfStatus(ex);
+                    throw ex;
+                }
                 File file = f.getLocation().toFile();
                 return getIvy(file);
             } else {



Mime
View raw message