Synchronize findClassOrResourceByDelegation

hq6 · hq6 · commit 449729ddd52d · 2024-10-27T20:03:08.000-07:00
diff --git a/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java b/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java
@@ -1416,6 +1416,7 @@ public URL getResourceByDelegation(String name)
     private Object findClassOrResourceByDelegation(String name, boolean isClass)
             throws ClassNotFoundException, ResourceNotFoundException
     {
+      synchronized (this) {
         Object result = null;
 
         Set requestSet = (Set) m_cycleCheck.get();
@@ -1598,6 +1599,7 @@ private Object findClassOrResourceByDelegation(String name, boolean isClass)
         }
 
         return result;
+      }
     }
 
     private Object searchImports(String pkgName, String name, boolean isClass)

Original file line number	Diff line number	Diff line change
`@@ -1416,6 +1416,7 @@ public URL getResourceByDelegation(String name)`
`1416`	`1416`	`private Object findClassOrResourceByDelegation(String name, boolean isClass)`
`1417`	`1417`	`throws ClassNotFoundException, ResourceNotFoundException`
`1418`	`1418`	`{`
	`1419`	`+ synchronized (this) {`
`1419`	`1420`	`Object result = null;`
`1420`	`1421`
`1421`	`1422`	`Set requestSet = (Set) m_cycleCheck.get();`
`@@ -1598,6 +1599,7 @@ private Object findClassOrResourceByDelegation(String name, boolean isClass)`
`1598`	`1599`	`}`
`1599`	`1600`
`1600`	`1601`	`return result;`
	`1602`	`+ }`
`1601`	`1603`	`}`
`1602`	`1604`
`1603`	`1605`	`private Object searchImports(String pkgName, String name, boolean isClass)`