Minor changes. (FELIX-851)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@733167 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/src/main/java/org/apache/felix/framework/searchpolicy/ModuleImpl.java b/framework/src/main/java/org/apache/felix/framework/searchpolicy/ModuleImpl.java
index 51aec37..c8cfd15 100644
--- a/framework/src/main/java/org/apache/felix/framework/searchpolicy/ModuleImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/searchpolicy/ModuleImpl.java
@@ -621,10 +621,7 @@
{
m_fragmentContents[i].close();
}
- synchronized (this)
- {
- m_classLoader = null;
- }
+ m_classLoader = null;
}
public IContent getContent()
@@ -819,15 +816,12 @@
return getClassPath()[index - 1].getEntryAsStream(urlPath);
}
- private ModuleClassLoader getClassLoader()
+ private synchronized ModuleClassLoader getClassLoader()
{
- synchronized (this)
+ if (m_classLoader == null)
{
- if (m_classLoader == null)
- {
- m_classLoader = m_secureAction.createModuleClassLoader(
- this, m_protectionDomain);
- }
+ m_classLoader = m_secureAction.createModuleClassLoader(
+ this, m_protectionDomain);
}
return m_classLoader;
}