felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r953481 - in /felix/sandbox/rickhall/framework-vb-2/src/main/java/org/apache/felix/framework: AbstractModuleImpl.java Felix.java FelixResolverState.java
Date Thu, 10 Jun 2010 22:25:20 GMT
Author: rickhall
Date: Thu Jun 10 22:25:19 2010
New Revision: 953481

URL: http://svn.apache.org/viewvc?rev=953481&view=rev
Log:
Cleanup handling of unmanaged modules.

Modified:
    felix/sandbox/rickhall/framework-vb-2/src/main/java/org/apache/felix/framework/AbstractModuleImpl.java
    felix/sandbox/rickhall/framework-vb-2/src/main/java/org/apache/felix/framework/Felix.java
    felix/sandbox/rickhall/framework-vb-2/src/main/java/org/apache/felix/framework/FelixResolverState.java

Modified: felix/sandbox/rickhall/framework-vb-2/src/main/java/org/apache/felix/framework/AbstractModuleImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-vb-2/src/main/java/org/apache/felix/framework/AbstractModuleImpl.java?rev=953481&r1=953480&r2=953481&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-vb-2/src/main/java/org/apache/felix/framework/AbstractModuleImpl.java
(original)
+++ felix/sandbox/rickhall/framework-vb-2/src/main/java/org/apache/felix/framework/AbstractModuleImpl.java
Thu Jun 10 22:25:19 2010
@@ -208,19 +208,11 @@ abstract class AbstractModuleImpl implem
         {
             if (((Wire) m_wires.get(i)).getCapability().getNamespace().equals(Capability.MODULE_NAMESPACE))
             {
-<<<<<<< HEAD
-                ((ModuleImpl) ((Wire) m_wires.get(i)).getExporter()).removeDependentRequirer(this);
-            }
-            else if (((Wire) m_wires.get(i)).getCapability().getNamespace().equals(Capability.PACKAGE_NAMESPACE))
-            {
-                ((ModuleImpl) ((Wire) m_wires.get(i)).getExporter()).removeDependentImporter(this);
-=======
                 ((AbstractModuleImpl) ((Wire) m_wires.get(i)).getExporter()).removeDependentRequirer(this);
             }
             else if (((Wire) m_wires.get(i)).getCapability().getNamespace().equals(Capability.PACKAGE_NAMESPACE))
             {
                 ((AbstractModuleImpl) ((Wire) m_wires.get(i)).getExporter()).removeDependentImporter(this);
->>>>>>> vb
             }
         }
 
@@ -231,19 +223,11 @@ abstract class AbstractModuleImpl implem
         {
             if (((Wire) m_wires.get(i)).getCapability().getNamespace().equals(Capability.MODULE_NAMESPACE))
             {
-<<<<<<< HEAD
-                ((ModuleImpl) ((Wire) m_wires.get(i)).getExporter()).addDependentRequirer(this);
-            }
-            else if (((Wire) m_wires.get(i)).getCapability().getNamespace().equals(Capability.PACKAGE_NAMESPACE))
-            {
-                ((ModuleImpl) ((Wire) m_wires.get(i)).getExporter()).addDependentImporter(this);
-=======
                 ((AbstractModuleImpl) ((Wire) m_wires.get(i)).getExporter()).addDependentRequirer(this);
             }
             else if (((Wire) m_wires.get(i)).getCapability().getNamespace().equals(Capability.PACKAGE_NAMESPACE))
             {
                 ((AbstractModuleImpl) ((Wire) m_wires.get(i)).getExporter()).addDependentImporter(this);
->>>>>>> vb
             }
         }
     }
@@ -411,4 +395,4 @@ abstract class AbstractModuleImpl implem
             return m_fragmentReq.toString();
         }
     }
-}
\ No newline at end of file
+}

Modified: felix/sandbox/rickhall/framework-vb-2/src/main/java/org/apache/felix/framework/Felix.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-vb-2/src/main/java/org/apache/felix/framework/Felix.java?rev=953481&r1=953480&r2=953481&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-vb-2/src/main/java/org/apache/felix/framework/Felix.java
(original)
+++ felix/sandbox/rickhall/framework-vb-2/src/main/java/org/apache/felix/framework/Felix.java
Thu Jun 10 22:25:19 2010
@@ -4240,11 +4240,7 @@ ex.printStackTrace();
                                 wires = new ArrayList<VBWire>(wires.size() + 1);
                                 wires.addAll(module.getWires());
                                 wires.add(candidateWire);
-<<<<<<< HEAD
-                                ((ModuleImpl) module).resolve(wires);
-=======
                                 ((AbstractModuleImpl) module).resolve(wires);
->>>>>>> vb
 m_logger.log(Logger.LOG_DEBUG, "DYNAMIC WIRE: " + wires.get(wires.size() - 1));
                             }
                         }

Modified: felix/sandbox/rickhall/framework-vb-2/src/main/java/org/apache/felix/framework/FelixResolverState.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-vb-2/src/main/java/org/apache/felix/framework/FelixResolverState.java?rev=953481&r1=953480&r2=953481&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-vb-2/src/main/java/org/apache/felix/framework/FelixResolverState.java
(original)
+++ felix/sandbox/rickhall/framework-vb-2/src/main/java/org/apache/felix/framework/FelixResolverState.java
Thu Jun 10 22:25:19 2010
@@ -556,19 +556,6 @@ public class FelixResolverState implemen
         {
             // Shouldn't happen.
         }
-<<<<<<< HEAD
-        // Set wires to null, which will remove the module from all
-        // of its dependent modules.
-        try
-        {
-            ((ModuleImpl) host).resolve(null);
-        }
-        catch (BundleException ex)
-        {
-            // Shouldn't happen.
-        }
-=======
->>>>>>> vb
     }
 
     private List<Module> getMatchingFragments(Module host)
@@ -976,4 +963,4 @@ public class FelixResolverState implemen
 
         return modules.get(0);
     }
-}
\ No newline at end of file
+}



Mime
View raw message