geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1134181 - in /geronimo/server/trunk/plugins: jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/internal/ myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/
Date Fri, 10 Jun 2011 03:08:07 GMT
Author: gawor
Date: Fri Jun 10 03:08:06 2011
New Revision: 1134181

URL: http://svn.apache.org/viewvc?rev=1134181&view=rev
Log:
GERONIMO-5976: Minor fix to avoid UnsupportedOperationException

Modified:
    geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/internal/TldRegistryImpl.java
    geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigRegistryImpl.java

Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/internal/TldRegistryImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/internal/TldRegistryImpl.java?rev=1134181&r1=1134180&r2=1134181&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/internal/TldRegistryImpl.java
(original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/internal/TldRegistryImpl.java
Fri Jun 10 03:08:06 2011
@@ -69,19 +69,17 @@ public class TldRegistryImpl implements 
     }
 
     private Set<Bundle> getDependentBundles(Bundle bundle) {
-        Set<Bundle> dependentBundles = null;
+        Set<Bundle> dependentBundles = new HashSet<Bundle>();
         
         // add in bundles from dependency manager
         ServiceReference serviceReference = bundleContext.getServiceReference(DependencyManager.class.getName());
         if (serviceReference != null) {
             DependencyManager dependencyManager = (DependencyManager) bundleContext.getService(serviceReference);
             try {
-                dependentBundles = dependencyManager.getFullDependentBundles(bundle.getBundleId());
+                dependentBundles.addAll(dependencyManager.getFullDependentBundles(bundle.getBundleId()));
             } finally {
                 bundleContext.ungetService(serviceReference);
             }
-        } else {
-            dependentBundles = new HashSet<Bundle>();
         }
         
         // add in wired bundles if WAB        

Modified: geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigRegistryImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigRegistryImpl.java?rev=1134181&r1=1134180&r2=1134181&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigRegistryImpl.java
(original)
+++ geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigRegistryImpl.java
Fri Jun 10 03:08:06 2011
@@ -125,19 +125,17 @@ public class ConfigRegistryImpl implemen
     private Set<Bundle> getDependentBundles(Long bundleId) {
         BundleContext bundleContext = activator.getBundleContext();
         
-        Set<Bundle> dependentBundles = null;
+        Set<Bundle> dependentBundles = new HashSet<Bundle>();
         
         // add in bundles from dependency manager
         ServiceReference serviceReference = bundleContext.getServiceReference(DependencyManager.class.getName());
         if (serviceReference != null) {
             DependencyManager dependencyManager = (DependencyManager) bundleContext.getService(serviceReference);
             try {
-                dependentBundles = dependencyManager.getFullDependentBundles(bundleId);
+                dependentBundles.addAll(dependencyManager.getFullDependentBundles(bundleId));
             } finally {
                 bundleContext.ungetService(serviceReference);
             }
-        } else {
-            dependentBundles = new HashSet<Bundle>();
         }
         
         // add in wired bundles if WAB        



Mime
View raw message