Author: mck
Date: Fri Sep 7 11:30:50 2018
New Revision: 1840286
URL: http://svn.apache.org/viewvc?rev=1840286&view=rev
Log:
Backport r1840285
svn merge -c1840285 ^/tiles/framework/trunk
Modified:
tiles/framework/branches/TILES_3_0_X/ (props changed)
tiles/framework/branches/TILES_3_0_X/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java
Propchange: tiles/framework/branches/TILES_3_0_X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 7 11:30:50 2018
@@ -1,3 +1,3 @@
/tiles/framework/branches/TILES_3_0_X:1484307
/tiles/framework/tags/tiles-parent-3.0.8:1814482
-/tiles/framework/trunk:829356,836356,880940,880948,887758,900938-902966,904552,921998,931637,949559,950449,982366-982367,989864-990230,996297,1042419,1061995,1080544,1080580-1081105,1427572,1427704
+/tiles/framework/trunk:829356,836356,880940,880948,887758,900938-902966,904552,921998,931637,949559,950449,982366-982367,989864-990230,996297,1042419,1061995,1080544,1080580-1081105,1427572,1427704,1840285
Modified:
tiles/framework/branches/TILES_3_0_X/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java?rev=1840286&r1=1840285&r2=1840286&view=diff
==============================================================================
---
tiles/framework/branches/TILES_3_0_X/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java
(original)
+++
tiles/framework/branches/TILES_3_0_X/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java
Fri Sep 7 11:30:50 2018
@@ -190,7 +190,8 @@ public final class OptionsRenderer imple
static boolean attemptTemplate(final String template) {
- return !TEMPLATE_EXISTS.containsKey(template) ||
TEMPLATE_EXISTS.get(template);
+ Boolean found = TEMPLATE_EXISTS.get(template);
+ return found == null || found;
}
static void update(final String template, final boolean found) {
