You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ivy-commits@incubator.apache.org by xa...@apache.org on 2007/07/06 07:18:42 UTC
svn commit: r553770 - in /incubator/ivy/ivyde/trunk: plugin.xml
src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
Author: xavier
Date: Fri Jul 6 00:18:41 2007
New Revision: 553770
URL: http://svn.apache.org/viewvc?view=rev&rev=553770
Log:
fix NPE in IvyClasspathContainer when there is no javadoc attachment (related to IVYDE-55 fix)
Modified:
incubator/ivy/ivyde/trunk/plugin.xml
incubator/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
Modified: incubator/ivy/ivyde/trunk/plugin.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/ivyde/trunk/plugin.xml?view=diff&rev=553770&r1=553769&r2=553770
==============================================================================
--- incubator/ivy/ivyde/trunk/plugin.xml (original)
+++ incubator/ivy/ivyde/trunk/plugin.xml Fri Jul 6 00:18:41 2007
@@ -3,7 +3,7 @@
<plugin
id="org.apache.ivyde.eclipse"
name="IvyDE Eclipse Plug-in"
- version="1.3.0.20070706071200"
+ version="1.3.0.20070706085200"
provider-name="Apache"
class="org.apache.ivyde.eclipse.IvyPlugin">
Modified: incubator/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
URL: http://svn.apache.org/viewvc/incubator/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java?view=diff&rev=553770&r1=553769&r2=553770
==============================================================================
--- incubator/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java (original)
+++ incubator/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java Fri Jul 6 00:18:41 2007
@@ -595,7 +595,10 @@
if (url == null) {
try {
- url = new URL("jar:"+classpathItem.getJavadocArtifactPath().toFile().toURI().toURL().toExternalForm()+"!/");
+ Path path = classpathItem.getJavadocArtifactPath();
+ if (path != null) {
+ url = new URL("jar:"+path.toFile().toURI().toURL().toExternalForm()+"!/");
+ }
} catch (MalformedURLException e) {
// ignored
}