Commit b87a7322 authored by Daniel Henninger's avatar Daniel Henninger Committed by dhenninger

[GATE-40] Found the gut cause of this and fixed.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@5425 b35dd754-fafc-0310-a699-88a17e54d16e
parent aa3cd823
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
package org.jivesoftware.wildfire.gateway; package org.jivesoftware.wildfire.gateway;
import org.jivesoftware.util.Log; import org.jivesoftware.util.Log;
import org.jivesoftware.util.NotFoundException;
import org.jivesoftware.database.DbConnectionManager; import org.jivesoftware.database.DbConnectionManager;
import java.sql.*; import java.sql.*;
...@@ -25,7 +26,7 @@ import java.util.Set; ...@@ -25,7 +26,7 @@ import java.util.Set;
public class PseudoRoster { public class PseudoRoster {
private static final String GET_ALL_USER_ROSTER_ITEMS = private static final String GET_ALL_USER_ROSTER_ITEMS =
"SELECT username,nickname,groups FROM gatewayPseudoRoster WHERE registrationID=?"; "SELECT username FROM gatewayPseudoRoster WHERE registrationID=?";
private static final String REMOVE_ROSTER_ITEM = private static final String REMOVE_ROSTER_ITEM =
"DELETE FROM gatewayPseudoRoster WHERE registrationID=? AND username=?"; "DELETE FROM gatewayPseudoRoster WHERE registrationID=? AND username=?";
...@@ -139,9 +140,12 @@ public class PseudoRoster { ...@@ -139,9 +140,12 @@ public class PseudoRoster {
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while (rs.next()) { while (rs.next()) {
String username = rs.getString(1); String username = rs.getString(1);
String nickname = rs.getString(2); try {
String groups = rs.getString(3); pseudoRosterItems.put(username, new PseudoRosterItem(registrationID, username));
pseudoRosterItems.put(username, new PseudoRosterItem(registrationID, username, nickname, groups)); }
catch (NotFoundException e) {
Log.error("Could not find pseudo roster item after already having found it.");
}
} }
} }
catch (SQLException sqle) { catch (SQLException sqle) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment