You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2014/07/16 20:48:06 UTC
git commit: WICKET-5645 throw MarkupException if no markup class is
associated
Repository: wicket
Updated Branches:
refs/heads/wicket-6.x 0c79489b9 -> c092d05b5
WICKET-5645 throw MarkupException if no markup class is associated
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c092d05b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c092d05b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c092d05b
Branch: refs/heads/wicket-6.x
Commit: c092d05b53b8abc3fd9a2a59ac0462dc8ba75e98
Parents: 0c79489
Author: svenmeier <sv...@meiers.net>
Authored: Wed Jul 16 20:44:59 2014 +0200
Committer: svenmeier <sv...@meiers.net>
Committed: Wed Jul 16 20:44:59 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/markup/MarkupResourceStream.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/c092d05b/wicket-core/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java b/wicket-core/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
index 6e11b8b..540f24a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
@@ -23,9 +23,9 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.wicket.Component;
+import org.apache.wicket.core.util.lang.WicketObjects;
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Bytes;
-import org.apache.wicket.core.util.lang.WicketObjects;
import org.apache.wicket.util.resource.IFixedLocationResourceStream;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
@@ -168,6 +168,10 @@ public class MarkupResourceStream implements IResourceStream, IFixedLocationReso
*/
public Class<? extends Component> getMarkupClass()
{
+ if (markupClassName == null)
+ {
+ throw new MarkupException("no associated markup class");
+ }
return WicketObjects.resolveClass(markupClassName);
}