[MMBASE SCM] r36550 - mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/pageflow

[michiel]

Author: michiel
Date: 2009-07-06 10:29:03 +0200 (Mon, 06 Jul 2009)
New Revision: 36550

Modified:
   
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/pageflow/Url.java
Log:
  MMB-1847

Modified: 
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/pageflow/Url.java
===================================================================
--- 
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/pageflow/Url.java
       2009-07-06 08:28:24 UTC (rev 36549)
+++ 
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/pageflow/Url.java
       2009-07-06 08:29:03 UTC (rev 36550)
@@ -153,7 +153,6 @@
     /**
      * Returns the URL as a String, always without the application context. 
Never <code>null</code>
      */
-
     public String get(boolean escapeamp) throws JspTagException, 
FrameworkException {
 
         String result = escapeamp ? cacheEscapeAmp : cacheNoEscapeAmp;
@@ -293,6 +292,11 @@
                             ? "" : ":" + port);
             }
         } else if (abs.equals("server")) {
+            if (ABSOLUTE_URLS.matcher(page).matches()) {
+                // The redirect tag giv
+                show.append(page);
+                return true;
+            }
             //show.append("/");
         } else if (abs.equals("context")) {
 
@@ -323,7 +327,9 @@
      * Returns the actual URL, considering all options of the url-tag, like 
'absolute' and 'encode'.
      */
     public String get() {
-        if (string != null) return string;
+        if (string != null) {
+            return string;
+        }
         try {
             String u = get(escapeAmps);
             log.debug("Produced " + u);

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs