Author: mir
Date: Tue Apr 13 14:08:15 2010
New Revision: 933616
URL: http://svn.apache.org/viewvc?rev=933616&view=rev
Log:
getDefaultBaseUri and getBaseUris are now in a privileged block
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java?rev=933616&r1=933615&r2=933616&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
Tue Apr 13 14:08:15 2010
@@ -18,6 +18,8 @@
*/
package org.apache.clerezza.platform.config;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
@@ -27,7 +29,6 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Service;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
-import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.NonLiteral;
import org.apache.clerezza.rdf.core.Resource;
import org.apache.clerezza.rdf.core.Triple;
@@ -78,20 +79,25 @@ public class PlatformConfig {
* @return the base URI of the Clerezza platform
*/
public UriRef getDefaultBaseUri() {
- Iterator<Resource> triples = getPlatformInstance().
- getObjects(PLATFORM.defaultBaseUri);
- if (triples.hasNext()) {
- return (UriRef) triples.next();
- } else {
- String port =
context.getProperty("org.osgi.service.http.port");
- if (port == null) {
- port = DEFAULT_PORT;
- }
- if (port.equals("80")) {
- return new UriRef("http://localhost/";);
+ return AccessController.doPrivileged(new
PrivilegedAction<UriRef>() {
+
+ @Override
+ public UriRef run() {
+ Iterator<Resource> triples =
getPlatformInstance().getObjects(PLATFORM.defaultBaseUri);
+ if (triples.hasNext()) {
+ return (UriRef) triples.next();
+ } else {
+ String port =
context.getProperty("org.osgi.service.http.port");
+ if (port == null) {
+ port = DEFAULT_PORT;
+ }
+ if (port.equals("80")) {
+ return new
UriRef("http://localhost/";);
+ }
+ return new UriRef("http://localhost:"; +
port + "/");
+ }
}
- return new UriRef("http://localhost:"; + port + "/");
- }
+ });
}
/**
@@ -119,15 +125,23 @@ public class PlatformConfig {
* @return the base URI of the Clerezza platform
*/
public Set<UriRef> getBaseUris() {
- Iterator<Resource> baseUrisIter = getPlatformInstance().
- getObjects(PLATFORM.baseUri);
- Set<UriRef> baseUris = new HashSet<UriRef>();
- while (baseUrisIter.hasNext()) {
- UriRef baseUri = (UriRef) baseUrisIter.next();
- baseUris.add(baseUri);
- }
- baseUris.add(getDefaultBaseUri());
- return baseUris;
+
+ return AccessController.doPrivileged(new
PrivilegedAction<Set<UriRef>>() {
+
+ @Override
+ public Set<UriRef> run() {
+ Iterator<Resource> baseUrisIter =
getPlatformInstance().
+ getObjects(PLATFORM.baseUri);
+ Set<UriRef> baseUris = new HashSet<UriRef>();
+ while (baseUrisIter.hasNext()) {
+ UriRef baseUri = (UriRef)
baseUrisIter.next();
+ baseUris.add(baseUri);
+ }
+ baseUris.add(getDefaultBaseUri());
+ return baseUris;
+ }
+ });
+
}
/**
