You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2008/05/24 00:24:09 UTC
svn commit: r659691 - in /ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse:
CHANGES.txt
src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
Author: hibou
Date: Fri May 23 15:24:07 2008
New Revision: 659691
URL: http://svn.apache.org/viewvc?rev=659691&view=rev
Log:
IVYDE-84: NPE that break eclipse: the Java project becomes empty
- handle issues when creating the job
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/IvyClasspathContainer.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=659691&r1=659690&r2=659691&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt Fri May 23 15:24:07 2008
@@ -13,6 +13,7 @@
- IMPROVE: Simplify the resolve process (IVYDE-64) (thanks to Nicolas Lalevée)
- IMPROVE: Add new target to build.xml to build the plugin with Ant (IVYDE-88)
+- FIX: NPE that break eclipse: the Java project becomes empty (IVYDE-84)
- FIX: IvyDE is dependant on environment variable MOZILLA_FIVE_HOME (IVYDE-10)
- FIX: no support of organization spelling (IVYDE-19)
- FIX: NPE when setting a bad file for the ivy setting path in the global configuration panel (IVYDE-91)
Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java?rev=659691&r1=659690&r2=659691&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java Fri May 23 15:24:07 2008
@@ -208,15 +208,24 @@
* @param monitor
*/
public void resolve(IProgressMonitor monitor) {
- computeClasspathEntries(false, true, true).run(monitor);
+ IvyResolveJob j = computeClasspathEntries(false, true, true);
+ if (j != null) {
+ j.run(monitor);
+ }
}
public void scheduleResolve() {
- computeClasspathEntries(false, true, true).schedule();
+ IvyResolveJob j = computeClasspathEntries(false, true, true);
+ if (j != null) {
+ j.schedule();
+ }
}
public void scheduleRefresh(boolean isUser) {
- computeClasspathEntries(true, true, isUser).schedule();
+ IvyResolveJob j = computeClasspathEntries(true, true, isUser);
+ if (j != null) {
+ j.schedule();
+ }
}
void updateClasspathEntries(boolean notify, final IClasspathEntry[] newEntries) {