geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r883918 - /geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/java/org/apache/geronimo/mavenplugins/osgi/utils/BundleResolver.java
Date Tue, 24 Nov 2009 23:11:33 GMT
Author: djencks
Date: Tue Nov 24 23:11:33 2009
New Revision: 883918

URL: http://svn.apache.org/viewvc?rev=883918&view=rev
Log:
try to explain a couple mistakes better, and avoid an NPE when a non-bundle is encountered

Modified:
    geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/java/org/apache/geronimo/mavenplugins/osgi/utils/BundleResolver.java

Modified: geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/java/org/apache/geronimo/mavenplugins/osgi/utils/BundleResolver.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/java/org/apache/geronimo/mavenplugins/osgi/utils/BundleResolver.java?rev=883918&r1=883917&r2=883918&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/java/org/apache/geronimo/mavenplugins/osgi/utils/BundleResolver.java
(original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/java/org/apache/geronimo/mavenplugins/osgi/utils/BundleResolver.java
Tue Nov 24 23:11:33 2009
@@ -300,6 +300,13 @@
                         if (b == bundle) {
                             continue;
                         }
+                        if (b.getSymbolicName() == null) {
+                            logError(b, level, "No SymbolicName " );
+                            continue;
+                        }
+                        if (constraint.getName() == null) {
+                            logError(bundle, level, "no constraint name: " + constraint);
+                        }
                         if (b.getSymbolicName().equals(constraint.getName())) {
                             if (constraint.getVersionRange().isIncluded(b.getVersion()))
{
                                 // There must be something wrong in the bundle



Mime
View raw message