You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by jo...@apache.org on 2011/04/27 21:40:50 UTC

svn commit: r1097217 - /shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java

Author: johnh
Date: Wed Apr 27 19:40:50 2011
New Revision: 1097217

URL: http://svn.apache.org/viewvc?rev=1097217&view=rev
Log:
Fix NPE for profiled JS generating from text-type JsContent.


Modified:
    shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java

Modified: shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java?rev=1097217&r1=1097216&r2=1097217&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java (original)
+++ shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java Wed Apr 27 19:40:50 2011
@@ -330,11 +330,13 @@ public class ClosureJsCompiler implement
         String compiled, int mapping) {
       JsContent sourceJs = orig.get(getRootSrc(mappings[mapping]));
       String sourceName = "[closure-compiler-synthesized]";
+      FeatureBundle bundle = null;
       if (sourceJs != null) {
         sourceName = sourceJs.getSource() != null ? sourceJs.getSource() : "";
+        bundle = sourceJs.getFeatureBundle();
       }
       out.add(JsContent.fromFeature(compiled.substring(startPos, codePos),
-          sourceName, sourceJs.getFeatureBundle(), null));
+          sourceName, bundle, null));
     }
     
     private static final String BEGIN_COMMENT = "/*";