You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2011/09/12 18:55:22 UTC
svn commit: r1169829 - in
/felix/trunk/framework/src/main/java/org/apache/felix/framework:
BundleImpl.java BundleWiringImpl.java StatefulResolver.java
Author: rickhall
Date: Mon Sep 12 16:55:22 2011
New Revision: 1169829
URL: http://svn.apache.org/viewvc?rev=1169829&view=rev
Log:
Fix some whitespace issues.
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java?rev=1169829&r1=1169828&r2=1169829&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java Mon Sep 12 16:55:22 2011
@@ -1013,21 +1013,22 @@ class BundleImpl implements Bundle, Bund
}
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);
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java?rev=1169829&r1=1169828&r2=1169829&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java Mon Sep 12 16:55:22 2011
@@ -346,6 +346,7 @@ public class BundleWiringImpl implements
}
}
}
+
if (System.getSecurityManager() != null)
{
for (Iterator<BundleCapability> iter = capList.iterator();iter.hasNext();)
@@ -359,8 +360,8 @@ public class BundleWiringImpl implements
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 @@ public class BundleWiringImpl implements
}
}
}
+
m_resolvedCaps = Collections.unmodifiableList(capList);
m_includedPkgFilters = (includedPkgFilters.isEmpty())
? Collections.EMPTY_MAP : includedPkgFilters;
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java?rev=1169829&r1=1169828&r2=1169829&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java Mon Sep 12 16:55:22 2011
@@ -1273,7 +1273,7 @@ class StatefulResolver
Set<BundleCapability> matches = capSet.match(sf, obeyMandatory);
for (BundleCapability cap : matches)
{
- if (filteredBySecurity(req, cap))
+ if (filteredBySecurity(req, cap))
{
continue;
}
@@ -1328,7 +1328,7 @@ class StatefulResolver
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 @@ class StatefulResolver
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 @@ class StatefulResolver
{
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 @@ class StatefulResolver
revisions.add(br);
singletons.put(br.getSymbolicName(), revisions);
}
-
}
\ No newline at end of file