svn commit: r958121 - /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 Jun 25 21:38:20 2010
New Revision: 958121

URL: http://svn.apache.org/viewvc?rev=958121&view=rev
Log:
using String a working key for the map of the compiled scripts

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=958121&r1=958120&r2=958121&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 Jun 25 21:38:20 2010
@@ -116,7 +116,7 @@ public class ScalaServerPagesRenderlet i
        private final byte[] byteCloser = (';' + lineSeparator).getBytes();
 
        //TODO a map with SoftReferences as keys
-       private Map<byte[], CompiledScript> compiledScripts = new 
HashMap<byte[], CompiledScript>();
+       private Map<String, CompiledScript> compiledScripts = new 
HashMap<String, CompiledScript>();
        
        @Override
        public void render(GraphNode res, GraphNode context,
@@ -226,15 +226,17 @@ public class ScalaServerPagesRenderlet i
        }
 
        private CompiledScript getCompiledScript(byte[] scriptBytes) throws 
ScriptException {
-               CompiledScript cs = compiledScripts.get(scriptBytes);
+               String scriptString;
+               try {
+                       scriptString = new String(scriptBytes, "UTF-8");
+               } catch (UnsupportedEncodingException ex) {
+                       throw new RuntimeException(ex);
+               }
+               CompiledScript cs = compiledScripts.get(scriptString);
                if (cs == null) {
-                       try {
-                               cs = 
((Compilable)scalaScriptEngineFactory.getScriptEngine())
-                                               .compile(new 
String(scriptBytes, "UTF-8"));
-                       } catch (UnsupportedEncodingException ex) {
-                               throw new RuntimeException(ex);
-                       }
-                       compiledScripts.put(scriptBytes, cs);
+                       cs = 
((Compilable)scalaScriptEngineFactory.getScriptEngine())
+                                       .compile(scriptString);
+                       compiledScripts.put(scriptString, cs);
                }
                return cs;
        }