Author: lryan
Date: Tue Dec  2 16:31:42 2008
New Revision: 722701

URL: http://svn.apache.org/viewvc?rev=722701&view=rev
Log:
Fix for NullPointerException rewriting style tags when no gadget url is 
available

Modified:
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/HTMLContentRewriter.java

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/HTMLContentRewriter.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/HTMLContentRewriter.java?rev=722701&r1=722700&r2=722701&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/HTMLContentRewriter.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/HTMLContentRewriter.java
 Tue Dec  2 16:31:42 2008
@@ -42,7 +42,6 @@
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
-import java.net.URI;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
@@ -192,8 +191,7 @@
           }
         }));
 
-    String concatBase = getConcatBase(gadgetUri.toJavaUri(), feature,
-      "text/css");
+    String concatBase = getConcatBase(gadgetUri, feature, "text/css");
 
     concatenateTags(feature, linkTags, concatBase, contentBase, "href");
 
@@ -204,7 +202,7 @@
     return new ProxyingLinkRewriter(gadgetUri, feature, proxyBaseNoGadget);
   }
 
-  protected String getConcatBase(URI gadgetUri, ContentRewriterFeature 
feature, String mimeType) {
+  protected String getConcatBase(Uri gadgetUri, ContentRewriterFeature 
feature, String mimeType) {
     return concatBaseNoGadget +
            ProxyBase.REWRITE_MIME_TYPE_PARAM +
            "=" + mimeType +
@@ -227,7 +225,7 @@
       }
     }));
 
-    String concatBase = getConcatBase(gadgetUri.toJavaUri(), feature, 
"text/javascript");
+    String concatBase = getConcatBase(gadgetUri, feature, "text/javascript");
     List<Element> concatenateable = new ArrayList<Element>();
     for (int i = 0; i < scriptTags.size(); i++) {
       Element scriptTag = scriptTags.get(i);


Reply via email to