svn commit: r1034297 - /incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java

[reto]

Author: reto
Date: Fri Nov 12 08:39:23 2010
New Revision: 1034297

URL: http://svn.apache.org/viewvc?rev=1034297&view=rev
Log:
removed workaround for now fixed FELIX-2273

Modified:
    
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java

Modified: 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java
URL: 
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java?rev=1034297&r1=1034296&r2=1034297&view=diff
==============================================================================
--- 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java
 (original)
+++ 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java
 Fri Nov 12 08:39:23 2010
@@ -221,25 +221,6 @@ public class ScalaServerPagesRenderlet i
 
        private Object exec(byte[] scriptBytes, final SimpleBindings values) 
throws ScriptException {
                final CompiledScript cs = getCompiledScript(scriptBytes);
-
-               try {
-                       return AccessController.doPrivileged(new 
PrivilegedExceptionAction<Object>() {
-
-                               @Override
-                               public Object run() throws ScriptException {
-                                       return cs.eval(values);
-                               }
-                       });
-               } catch (PrivilegedActionException ex) {
-                       Exception cause = (Exception) ex.getCause();
-                       logger.debug("Exception executing ScalaServerPage 
Script", cause);
-                       if (cause instanceof ScriptException) {
-                               throw (ScriptException) cause;
-                       }
-                       throw new RuntimeException(cause);
-               } catch (RuntimeException ex) {
-                       logger.debug("RuntimeException executing 
ScalaServerPage Script", ex);
-                       throw ex;
-               }
+               return cs.eval(values);
        }
 }