incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lin...@apache.org
Subject svn commit: r942830 - /incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java
Date Mon, 10 May 2010 17:44:37 GMT
Author: linsun
Date: Mon May 10 17:44:37 2010
New Revision: 942830

URL: http://svn.apache.org/viewvc?rev=942830&view=rev
Log:
check for Null for blueprintHeaderAnnotation header

Modified:
    incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java?rev=942830&r1=942829&r2=942830&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java
(original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java
Mon May 10 17:44:37 2010
@@ -71,7 +71,6 @@ public class BlueprintExtender implement
     private NamespaceHandlerRegistry handlers;
     private RecursiveBundleTracker bt;
     private ServiceRegistration parserServiceReg;
-    private ServiceTracker st;
 
     public void start(BundleContext context) {
         LOGGER.debug("Starting blueprint extender...");
@@ -239,7 +238,7 @@ public class BlueprintExtender implement
                 }
             }
             
-            if (pathList.isEmpty() && blueprintHeaderAnnotation.trim().equalsIgnoreCase("true"))
{
+            if (pathList.isEmpty() && blueprintHeaderAnnotation != null &&
blueprintHeaderAnnotation.trim().equalsIgnoreCase("true")) {
                 LOGGER.debug("Scanning bundle {} for blueprint annotations", bundle.getSymbolicName());
                 ServiceReference sr = this.context.getServiceReference("org.apache.aries.blueprint.annotation.service.BlueprintAnnotationScanner");
                            



Mime
View raw message