Author: reto
Date: Thu Aug 18 10:48:35 2011
New Revision: 1159152
URL: http://svn.apache.org/viewvc?rev=1159152&view=rev
Log:
CLEREZZA-621: do access control only if security manager is in place
Modified:
incubator/clerezza/trunk/parent/shell/src/main/scala/org/apache/clerezza/shell/ShellFactory.scala
Modified:
incubator/clerezza/trunk/parent/shell/src/main/scala/org/apache/clerezza/shell/ShellFactory.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/shell/src/main/scala/org/apache/clerezza/shell/ShellFactory.scala?rev=1159152&r1=1159151&r2=1159152&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/shell/src/main/scala/org/apache/clerezza/shell/ShellFactory.scala
(original)
+++
incubator/clerezza/trunk/parent/shell/src/main/scala/org/apache/clerezza/shell/ShellFactory.scala
Thu Aug 18 10:48:35 2011
@@ -48,7 +48,10 @@ class ShellFactory() {
}
def createShell(pIn: InputStream, pOut: OutputStream) = {
- AccessController.checkPermission(new ShellPermission())
+ var security: SecurityManager = System.getSecurityManager
+ if (security != null) {
+ AccessController.checkPermission(new ShellPermission())
+ }
AccessController.doPrivileged(new PrivilegedAction[Shell] {
override def run() = {
val shell = new
Shell(interpreterFactory, pIn, pOut, commands)
