portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dettb...@apache.org
Subject svn commit: r616410 - /portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
Date Tue, 29 Jan 2008 15:54:10 GMT
Author: dettborn
Date: Tue Jan 29 07:54:03 2008
New Revision: 616410

URL: http://svn.apache.org/viewvc?rev=616410&view=rev
Log:
Fix bug for ActionParameter.
Now actionparameter and PublicRenderParameter are merged and for an ActionURL PublicParameter
can't be set.
See clarification from the new spec.
In StateAwareResponseImpl you can't sendredirect after removePRP and setEvent.

Modified:
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java

Modified: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java?rev=616410&r1=616409&r2=616410&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
(original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
Tue Jan 29 07:54:03 2008
@@ -181,11 +181,11 @@
         		PortalURLParameter param = decodePublicParameter(token, value);
         		if( param != null )
         		{
-        			portalURL.addParameter( param );
+        			//set public parameter in portalURL
+    	    		portalURL.addPublicParameterCurrent(param.getName(), param.getValues());
         		}
 	    		
-	    		// set public parameter in portalURL
-	    		portalURL.addPublicParameterCurrent(param.getName(), param.getValues());
+	    		
         	}
         }
         if (renderPath.length() > 0) {
@@ -284,11 +284,7 @@
         }
 
         StringUtils.encode(buffer);
-        // Construct the string representing the portal URL.
-        // Fix for PLUTO-247 - check if query string contains parameters
-        if ( query.length() > 1 ) {
-            return buffer.append(query).toString();
-        }
+        
         
         Map<String, String[]> publicParamList = portalURL.getPublicParameters();
         if (publicParamList!=null){
@@ -301,6 +297,12 @@
 	        		buffer.append("/").append(valueString);
 	        	}
 	        }
+        }
+        
+        // Construct the string representing the portal URL.
+        // Fix for PLUTO-247 - check if query string contains parameters
+        if ( query.length() > 1 ) {
+            return buffer.append(query).toString();
         }
         
         // Construct the string representing the portal URL.



Mime
View raw message