kimptoc 01/11/30 09:16:35 Modified: src/java/org/apache/jetspeed/services/psmlmanager/db DatabasePsmlManagerService.java Log: ensure tableName set before calls to db Revision Changes Path 1.8 +4 -4 jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/db/DatabasePsmlManagerService.java Index: DatabasePsmlManagerService.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/db/DatabasePsmlManagerService.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- DatabasePsmlManagerService.java 2001/11/30 15:50:17 1.7 +++ DatabasePsmlManagerService.java 2001/11/30 17:16:35 1.8 @@ -868,6 +868,7 @@ { if (user != null) { + tableName = "JETSPEED_USER_PROFILE"; records = new JetspeedUserProfilePeer().select(locator); Iterator iterator = records.iterator(); while (iterator.hasNext()) @@ -877,10 +878,10 @@ page = uprofile.getPage(); portlets = DBUtils.bytesToPortlets(uprofile.getProfile()); } - tableName = "JETSPEED_USER_PROFILE"; } else if (role != null) { + tableName = "JETSPEED_ROLE_PROFILE"; records = new JetspeedRoleProfilePeer().select(locator); Iterator iterator = records.iterator(); while (iterator.hasNext()) @@ -890,10 +891,10 @@ page = rprofile.getPage(); portlets = DBUtils.bytesToPortlets(rprofile.getProfile()); } - tableName = "JETSPEED_ROLE_PROFILE"; } else if (group != null) { + tableName = "JETSPEED_GROUP_PROFILE"; records = new JetspeedGroupProfilePeer().select(locator); Iterator iterator = records.iterator(); while (iterator.hasNext()) @@ -903,10 +904,10 @@ page = gprofile.getPage(); portlets = DBUtils.bytesToPortlets(gprofile.getProfile()); } - tableName = "JETSPEED_GROUP_PROFILE"; } else // it will be anonymous access { + tableName = "JETSPEED_ANON_PROFILE"; records = new JetspeedAnonProfilePeer().select(locator); Iterator iterator = records.iterator(); while (iterator.hasNext()) @@ -916,7 +917,6 @@ page = aprofile.getPage(); portlets = DBUtils.bytesToPortlets(aprofile.getProfile()); } - tableName = "JETSPEED_ANON_PROFILE"; } if (page != null && portlets != null) {
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>