svn commit: r519055 - /tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java

[ap...@apache.org]

Author: apetrelli
Date: Fri Mar 16 09:42:48 2007
New Revision: 519055

URL: http://svn.apache.org/viewvc?view=rev&rev=519055
Log:
Now when the attribute type is calculated, a new TilesRequestContext is not created.

Modified:
    tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java

Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java?view=diff&rev=519055&r1=519054&r2=519055
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java Fri Mar 16 09:42:48 2007
@@ -440,7 +440,7 @@
         ComponentContext context = getComponentContext(requestItems);
         TilesRequestContext request = getRequestContext(requestItems);
 
-        String type = calculateType(attr, requestItems);
+        String type = calculateType(attr, request);
         if ("string".equalsIgnoreCase(type)) {
             writer.write(attr.getValue().toString());
             return;
@@ -477,18 +477,18 @@
      * Calculates the type of an attribute.
      *
      * @param attr The attribute to check.
-     * @param requestItems The request items.
+     * @param request The request object.
      * @return The calculated attribute type.
      * @throws TilesException If the type is not recognized.
      */
     private String calculateType(ComponentAttribute attr,
-            Object... requestItems) throws TilesException {
+            TilesRequestContext request) throws TilesException {
         String type = attr.getType();
         if (type == null) {
             Object valueContent = attr.getValue();
             if (valueContent instanceof String) {
                 String valueString = (String) valueContent;
-                if (isValidDefinition(valueString, requestItems)) {
+                if (isValidDefinition(request, valueString)) {
                     type = ComponentAttribute.DEFINITION;
                 } else if (valueString.startsWith("/")) {
                     type = ComponentAttribute.TEMPLATE;