svn commit: r1058264 - /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/Markup.java

[ivaynberg]

Author: ivaynberg
Date: Wed Jan 12 18:21:40 2011
New Revision: 1058264

URL: http://svn.apache.org/viewvc?rev=1058264&view=rev
Log:

Issue: WICKET-3324

Modified:
    wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/Markup.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/Markup.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/Markup.java?rev=1058264&r1=1058263&r2=1058264&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/Markup.java 
(original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/Markup.java 
Wed Jan 12 18:21:40 2011
@@ -29,12 +29,12 @@ import org.slf4j.LoggerFactory;
 
 /**
  * The content of a markup file, consisting of a list of markup elements.
- *
+ * 
  * @see MarkupResourceStream
  * @see MarkupElement
  * @see ComponentTag
  * @see RawMarkup
- *
+ * 
  * @author Juergen Donnerstag
  */
 public class Markup implements IMarkupFragment
@@ -60,7 +60,7 @@ public class Markup implements IMarkupFr
 
        /**
         * Constructor
-        *
+        * 
         * @param markup
         *            The associated Markup
         */
@@ -71,7 +71,7 @@ public class Markup implements IMarkupFr
 
        /**
         * Constructor
-        *
+        * 
         * @param markupResourceStream
         *            The associated Markup
         */
@@ -97,7 +97,7 @@ public class Markup implements IMarkupFr
        }
 
        /**
-        *
+        * 
         * @return The fixed location as a string, e.g. the file name or the 
URL. Return null to avoid
         *         caching the markup.
         */
@@ -113,7 +113,7 @@ public class Markup implements IMarkupFr
 
        /**
         * Add a MarkupElement
-        *
+        * 
         * @param markupElement
         */
        final public void addMarkupElement(final MarkupElement markupElement)
@@ -123,7 +123,7 @@ public class Markup implements IMarkupFr
 
        /**
         * Add a MarkupElement
-        *
+        * 
         * @param pos
         * @param markupElement
         */
@@ -198,15 +198,26 @@ public class Markup implements IMarkupFr
        public final String toString(final boolean markupOnly)
        {
                final AppendingStringBuffer buf = new 
AppendingStringBuffer(400);
+
                if (markupOnly == false)
                {
-                       buf.append(markupResourceStream.toString());
+                       if (markupResourceStream != null)
+                       {
+                               buf.append(markupResourceStream.toString());
+                       }
+                       else
+                       {
+                               buf.append("null MarkupResouceStream");
+                       }
                        buf.append("\n");
                }
 
-               for (MarkupElement markupElement : markupElements)
+               if (markupElements != null)
                {
-                       buf.append(markupElement);
+                       for (MarkupElement markupElement : markupElements)
+                       {
+                               buf.append(markupElement);
+                       }
                }
 
                return buf.toString();