[jboss-cvs] JBossAS SVN: r91203 - projects/jboss-osgi/trunk/reactor/bundles/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi.

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

Author: thomas.diesler at jboss.com
Date: 2009-07-14 07:36:38 -0400 (Tue, 14 Jul 2009)
New Revision: 91203

Modified:
   projects/jboss-osgi/trunk/reactor/bundles/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/HuskyExtender.java
Log:
Prevent potential NPE

Modified: projects/jboss-osgi/trunk/reactor/bundles/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/HuskyExtender.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/bundles/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/HuskyExtender.java	2009-07-14 11:34:29 UTC (rev 91202)
+++ projects/jboss-osgi/trunk/reactor/bundles/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/HuskyExtender.java	2009-07-14 11:36:38 UTC (rev 91203)
@@ -92,13 +92,15 @@
       }
 
       if (srefs != null)
+      {
          log.log(LogService.LOG_INFO, "Register test packages " + packages);
          
-      for (ServiceReference sref : srefs)
-      {
-         Connector connector = (Connector)context.getService(sref);
-         JUnitPackageListener listener = new OSGiJUnitPackageListener(bundle, packages);
-         connector.addPackageListener(listener);
+         for (ServiceReference sref : srefs)
+         {
+            Connector connector = (Connector)context.getService(sref);
+            JUnitPackageListener listener = new OSGiJUnitPackageListener(bundle, packages);
+            connector.addPackageListener(listener);
+         }
       }
    }
 
@@ -115,16 +117,17 @@
       }
       
       if (srefs != null)
+      {
          log.log(LogService.LOG_INFO, "Unregister test packages " + packages);
-         
-      for (ServiceReference sref : srefs)
-      {
-         Connector connector = (Connector)context.getService(sref);
-         for (PackageListener listener : new ArrayList<PackageListener>(connector.getPackageListeners()))
+         for (ServiceReference sref : srefs)
          {
-            List<String> auxNames = listener.getPackageNames();
-            if (auxNames.equals(packages))
-               connector.removePackageListener(listener);
+            Connector connector = (Connector)context.getService(sref);
+            for (PackageListener listener : new ArrayList<PackageListener>(connector.getPackageListeners()))
+            {
+               List<String> auxNames = listener.getPackageNames();
+               if (auxNames.equals(packages))
+                  connector.removePackageListener(listener);
+            }
          }
       }
    }