From 323f3f0fbac2e14fb6e91da243ceab695a24dff9 Mon Sep 17 00:00:00 2001 From: Martin Goellnitz Date: Tue, 19 Apr 2016 17:56:30 +0200 Subject: [PATCH] Cope with hex valued IDs --- core/src/org/tangram/components/DefaultHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/org/tangram/components/DefaultHandler.java b/core/src/org/tangram/components/DefaultHandler.java index 12e6ea27..8a70c69e 100644 --- a/core/src/org/tangram/components/DefaultHandler.java +++ b/core/src/org/tangram/components/DefaultHandler.java @@ -68,7 +68,7 @@ public void setMaxInlinedBlobSize(int maxInlinedBlobSize) { } // setMaxInlinedBlobSize() - @LinkAction("/id_([A-Z][a-zA-Z]+:[0-9]+)/view_([a-zA-Z0-9]+)") + @LinkAction("/id_([A-Z][a-zA-Z]+:[0-9a-f]+)/view_([a-zA-Z0-9]+)") public TargetDescriptor render(@LinkPart(1) String id, @LinkPart(2) String view, HttpServletRequest request, HttpServletResponse response) throws IOException { Utils.setPrimaryBrowserLanguageForJstl(request); LOG.debug("render() id={} view={}", id, view); @@ -82,7 +82,7 @@ public TargetDescriptor render(@LinkPart(1) String id, @LinkPart(2) String view, } // render() - @LinkAction("/id_([A-Z][a-zA-Z]+:[0-9]+)") + @LinkAction("/id_([A-Z][a-zA-Z]+:[0-9a-f]+)") public TargetDescriptor render(@LinkPart(1) String id, HttpServletRequest request, HttpServletResponse response) throws IOException { return render(id, null, request, response); } // render()