felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clem...@apache.org
Subject svn commit: r590701 - /felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java
Date Wed, 31 Oct 2007 15:02:13 GMT
Author: clement
Date: Wed Oct 31 08:02:13 2007
New Revision: 590701

URL: http://svn.apache.org/viewvc?rev=590701&view=rev
Log:
Fix a synchronization bug in the component instance manager.

Modified:
    felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java

Modified: felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java?rev=590701&r1=590700&r2=590701&view=diff
==============================================================================
--- felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java (original)
+++ felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java Wed Oct
31 08:02:13 2007
@@ -677,7 +677,7 @@
      * @return the value decided by the last asked handler (throw a warning if
      * two fields decide two different values)
      */
-    public synchronized Object getterCallback(String fieldName) {
+    public Object getterCallback(String fieldName) {
         Object initialValue = m_map.get(fieldName);
         Object result = initialValue;
         // Get the list of registered handlers
@@ -711,7 +711,7 @@
      * Dispatch entry method event on registered handler.
      * @param methodId : method id
      */
-    public synchronized void entryCallback(String methodId) {
+    public void entryCallback(String methodId) {
         PrimitiveHandler[] list = (PrimitiveHandler[]) m_methodRegistration.get(methodId);
         for (int i = 0; list != null && i < list.length; i++) {
             list[i].entryCallback(methodId);
@@ -725,7 +725,7 @@
      * @param methodId : method id
      * @param e : returned object.
      */
-    public synchronized void exitCallback(String methodId, Object e) {
+    public void exitCallback(String methodId, Object e) {
         PrimitiveHandler[] list = (PrimitiveHandler[]) m_methodRegistration.get(methodId);
         for (int i = 0; list != null && i < list.length; i++) {
             list[i].exitCallback(methodId, e);
@@ -740,7 +740,7 @@
      * called
      * @param objectValue : the value of the field
      */
-    public synchronized void setterCallback(String fieldName, Object objectValue) {
+    public void setterCallback(String fieldName, Object objectValue) {
         Object o = m_map.get(fieldName);
         if ((o != null && ! o.equals(objectValue)) || (o == null && objectValue
!= null)) {
             m_map.put(fieldName, objectValue);



Mime
View raw message