Author: thomas.heute(a)jboss.com Date: 2008-05-05 09:48:17 -0400 (Mon, 05 May 2008) New Revision: 10744 Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java branches/JBoss_Portal_Branch_2_6/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/ObjectURL.java Log: Adapt to the new common modifications Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java 2008-05-05 11:19:41 UTC (rev 10743) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java 2008-05-05 13:48:17 UTC (rev 10744) @@ -1110,7 +1110,14 @@ if (changePassword) { - user.updatePassword(pass1); + try + { + user.updatePassword(pass1); + } + catch (IdentityException e) + { + e.printStackTrace(); + } } if (timezoneoffset.shortValue() != UNDEFINED_TIMEZONE) Modified: branches/JBoss_Portal_Branch_2_6/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2008-05-05 11:19:41 UTC (rev 10743) +++ branches/JBoss_Portal_Branch_2_6/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2008-05-05 13:48:17 UTC (rev 10744) @@ -52,6 +52,9 @@ import javax.faces.context.FacesContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import java.io.IOException; +import java.io.StringWriter; import java.util.Iterator; import java.util.Map; @@ -112,7 +115,8 @@ ViewHandler vh = faces.getApplication().getViewHandler(); String viewId = faces.getViewRoot().getViewId(); String clientId = uiportlet.getClientId(faces); - StringBuffer url = new StringBuffer(vh.getActionURL(faces, viewId)); + StringWriter url = new StringWriter(); + url.write(vh.getActionURL(faces, viewId)); // url.append("&").append(clientId).append("=jbp"); @@ -133,6 +137,15 @@ } } + try + { + url.close(); + } + catch (IOException e) + { + e.printStackTrace(); + } + // return url.toString(); } Modified: branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/ObjectURL.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/ObjectURL.java 2008-05-05 11:19:41 UTC (rev 10743) +++ branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/ObjectURL.java 2008-05-05 13:48:17 UTC (rev 10744) @@ -27,6 +27,8 @@ import org.jboss.portal.test.theme.model.RenderedObject; import org.jboss.portal.test.theme.model.WindowObject; +import java.io.IOException; +import java.io.StringWriter; import java.util.HashMap; import java.util.Map; @@ -61,7 +63,7 @@ public String toString() { - StringBuffer url = new StringBuffer(); + StringWriter url = new StringWriter(); // url.append(requestContext.request.getContextPath()); @@ -92,6 +94,15 @@ encoder.encode(value, url); } + try + { + url.close(); + } + catch (IOException e) + { + e.printStackTrace(); + } + return url.toString(); } }