Author: woonsan
Date: Wed Sep 5 23:36:04 2007
New Revision: 573159
URL: http://svn.apache.org/viewvc?rev=573159&view=rev
Log:
Fixed a bug originated from the revision 551861, which was done for [JS2-739].
By the revision, o.a.j.u.Path#addSegment method does not change its object any
more. Instead it returns newly created Path object.
However, o.a.j.decoration.DecorationFactoryImpl class has remained as it used
to expect basePath to change itself in createClientPath() method.
Therefore, DecorationFactoryImpl#createClientPath() has to reset basePath
variable by the returned new Path object.
Modified:
portals/jetspeed-2/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java
Modified:
portals/jetspeed-2/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java?rev=573159&r1=573158&r2=573159&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java
(original)
+++
portals/jetspeed-2/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java
Wed Sep 5 23:36:04 2007
@@ -342,16 +342,16 @@
String country = locale.getCountry();
String variant = locale.getVariant();
- basePath.addSegment( mediaType ).addSegment( language );
+ basePath = basePath.addSegment( mediaType ).addSegment( language );
if ( country != null )
{
- basePath.addSegment( country );
+ basePath = basePath.addSegment( country );
}
if (variant != null)
{
- basePath.addSegment( variant );
+ basePath = basePath.addSegment( variant );
}
return basePath;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
