You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by mh...@apache.org on 2011/04/28 04:26:37 UTC
svn commit: r1097307 -
/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CompilationProcessor.java
Author: mhermanto
Date: Thu Apr 28 02:26:37 2011
New Revision: 1097307
URL: http://svn.apache.org/viewvc?rev=1097307&view=rev
Log:
Minor fix to compilation processor to properly suck externs, issue introduced in r1097023.
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CompilationProcessor.java
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CompilationProcessor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CompilationProcessor.java?rev=1097307&r1=1097306&r2=1097307&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CompilationProcessor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CompilationProcessor.java Thu Apr 28 02:26:37 2011
@@ -37,9 +37,7 @@ public class CompilationProcessor implem
* TODO: Convert JsCompiler to take JsResponseBuilder directly rather than Iterable<JsContent>
*/
public boolean process(JsRequest request, JsResponseBuilder builder) throws JsException {
- JsResponse responseSoFar = builder.build();
-
- Iterable<JsContent> jsContents = responseSoFar.getAllJsContent();
+ Iterable<JsContent> jsContents = builder.build().getAllJsContent();
for (JsContent jsc : jsContents) {
FeatureBundle bundle = jsc.getFeatureBundle();
if (bundle != null) {
@@ -48,8 +46,8 @@ public class CompilationProcessor implem
}
JsResponse result = compiler.compile(request.getJsUri(), jsContents,
- responseSoFar.getExterns());
-
+ builder.build().getExterns());
+
builder.clearJs().appendAllJs(result.getAllJsContent());
builder.setStatusCode(result.getStatusCode());
builder.addErrors(result.getErrors());