Fix some whitespace issues.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1169829 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/src/main/java/org/apache/felix/framework/BundleImpl.java b/framework/src/main/java/org/apache/felix/framework/BundleImpl.java
index 83e8b10..4d2e009 100644
--- a/framework/src/main/java/org/apache/felix/framework/BundleImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/BundleImpl.java
@@ -1013,21 +1013,22 @@
}
private static final SecurityManagerEx m_smEx = new SecurityManagerEx();
private static final ClassLoader m_classloader = Felix.class.getClassLoader();
-
- <A> void checkAdapt(Class<A> type)
+
+ <A> void checkAdapt(Class<A> type)
{
Object sm = System.getSecurityManager();
if ((sm != null) && (getFramework().getSecurityProvider() != null))
{
Class caller = m_smEx.getClassContext()[3];
if (((Felix.m_secureAction.getClassLoader(caller) != m_classloader) ||
- !caller.getName().startsWith("org.apache.felix.framework.")))
+ !caller.getName().startsWith("org.apache.felix.framework.")))
{
((SecurityManager) sm).checkPermission(
new AdaptPermission(type.getName(), this, AdaptPermission.ADAPT));
}
}
}
+
public synchronized <A> A adapt(Class<A> type)
{
checkAdapt(type);
diff --git a/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java b/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java
index f63755c..700740e 100644
--- a/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java
@@ -346,6 +346,7 @@
}
}
}
+
if (System.getSecurityManager() != null)
{
for (Iterator<BundleCapability> iter = capList.iterator();iter.hasNext();)
@@ -359,8 +360,8 @@
iter.remove();
}
}
- else if (!cap.getNamespace().equals(BundleRevision.HOST_NAMESPACE) && !cap.getNamespace().equals(BundleRevision.BUNDLE_NAMESPACE) &&
- !cap.getNamespace().equals("osgi.ee"))
+ else if (!cap.getNamespace().equals(BundleRevision.HOST_NAMESPACE) && !cap.getNamespace().equals(BundleRevision.BUNDLE_NAMESPACE) &&
+ !cap.getNamespace().equals("osgi.ee"))
{
if (!((BundleProtectionDomain) ((BundleRevisionImpl) cap.getRevision()).getProtectionDomain()).impliesDirect(
new CapabilityPermission(cap.getNamespace(), CapabilityPermission.PROVIDE)))
@@ -370,6 +371,7 @@
}
}
}
+
m_resolvedCaps = Collections.unmodifiableList(capList);
m_includedPkgFilters = (includedPkgFilters.isEmpty())
? Collections.EMPTY_MAP : includedPkgFilters;
diff --git a/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java b/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java
index 053ba9f..22f81dd 100644
--- a/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java
+++ b/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java
@@ -1273,7 +1273,7 @@
Set<BundleCapability> matches = capSet.match(sf, obeyMandatory);
for (BundleCapability cap : matches)
{
- if (filteredBySecurity(req, cap))
+ if (filteredBySecurity(req, cap))
{
continue;
}
@@ -1328,7 +1328,7 @@
if (System.getSecurityManager() != null)
{
BundleRevisionImpl reqRevision = (BundleRevisionImpl) req.getRevision();
-
+
if (req.getNamespace().equals(BundleRevision.PACKAGE_NAMESPACE))
{
if (!((BundleProtectionDomain) ((BundleRevisionImpl) cap.getRevision()).getProtectionDomain()).impliesDirect(
@@ -1357,8 +1357,8 @@
return true;
}
}
- else if (req.getNamespace().equals(BundleRevision.HOST_NAMESPACE))
- {
+ else if (req.getNamespace().equals(BundleRevision.HOST_NAMESPACE))
+ {
if (!((BundleProtectionDomain) reqRevision.getProtectionDomain())
.impliesDirect(new BundlePermission(
reqRevision.getSymbolicName(),
@@ -1370,14 +1370,14 @@
{
return true;
}
- }
+ }
else if (!req.getNamespace().equals("osgi.ee"))
{
if (!((BundleProtectionDomain) ((BundleRevisionImpl) cap.getRevision()).getProtectionDomain()).impliesDirect(
new CapabilityPermission(req.getNamespace(), CapabilityPermission.PROVIDE))
- ||
+ ||
!((reqRevision == null) || ((BundleProtectionDomain) reqRevision.getProtectionDomain()).impliesDirect(
- new CapabilityPermission(req.getNamespace(), cap.getAttributes(), cap.getRevision().getBundle(), CapabilityPermission.REQUIRE))))
+ new CapabilityPermission(req.getNamespace(), cap.getAttributes(), cap.getRevision().getBundle(), CapabilityPermission.REQUIRE))))
{
return true;
}
@@ -1493,5 +1493,4 @@
revisions.add(br);
singletons.put(br.getSymbolicName(), revisions);
}
-
}
\ No newline at end of file