[jboss-osgi-commits] JBoss-OSGI SVN: r97218 - in projects/jboss-osgi/projects: runtime/framework/branches/1.0.0.Alpha2/src/main/java/org/jboss/osgi/framework/deployers and 1 other directory.

[jboss-osgi-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-12-01 06:34:45 -0500 (Tue, 01 Dec 2009)
New Revision: 97218

Modified:
   projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml
   projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2/src/main/java/org/jboss/osgi/framework/deployers/OSGiDeployersWrapper.java
Log:
Fix NPE in DeployersWrapper

Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml	2009-12-01 11:14:07 UTC (rev 97217)
+++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml	2009-12-01 11:34:45 UTC (rev 97218)
@@ -14,7 +14,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <name>JBossOSGi Bundles - JBossXB</name>
+  <name>JBossOSGi Bundles - XML Binding</name>
   <description>A JBossOSGi provided JBossXB bundle</description>
 
   <groupId>org.jboss.osgi.bundles</groupId>

Modified: projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2/src/main/java/org/jboss/osgi/framework/deployers/OSGiDeployersWrapper.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2/src/main/java/org/jboss/osgi/framework/deployers/OSGiDeployersWrapper.java	2009-12-01 11:14:07 UTC (rev 97217)
+++ projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2/src/main/java/org/jboss/osgi/framework/deployers/OSGiDeployersWrapper.java	2009-12-01 11:34:45 UTC (rev 97218)
@@ -130,7 +130,9 @@
                continue;
             
             Deployment dep = unit.getAttachment(Deployment.class);
-            if (dep.isAutoStart() == true && bundle.getState() == Bundle.INSTALLED)
+            boolean autoStart = (dep != null ? dep.isAutoStart() : true);
+            
+            if (autoStart == true && bundle.getState() == Bundle.INSTALLED)
             {
                unresolvedBundles.add(0, bundle);
             }